Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: merge main into explore (#4260)
* refactor: remove hideRouteDiagram prop (#3763) * fix: Revert "refactor: remove coinbase wallet resetState" (#4081) Revert "refactor: remove coinbase wallet resetState (#4024)" This reverts commit e36722c. * feat: add support for Celo (#3915) * feat: Support for Celo * fix: wrong condition * combine celo and alfajores lists * use celo erc20 representation * fix: refactor infura.ts to networks.ts & add celo to rpc urls * feature: add celo contract addresses fix: remove celo from supported gas estimate chains until feature is available * refactor: useUSDCPrice to useStablecoinPrice fix: add celo to supported gas estimate chains * fix: use unique factory address for getting pool address * fix: darkmode background graident * fix: removing a comment left behind * fix: remove bad import * fix: remove dead link until the Celo is live on info.uniswap.org * fix: add asset to common bases & minor refactoring * fix: celo info links point to root info.uniswap.org * fix: change celo token bridge to portal * fix: update redux-multicall to latest version * refactor: for code readability * fix: celo banner colors & remove unused alternative logo * fix: change celo token list to hosted version * fix: update celo banner colors * fix: move celo to the bottom of the network selector list * fix: dedup dependencies @uniswap/router-sdk @uniswap/v3-sdk * fix: refactoring + move Celo above L2s * fix: update celo contract addresses * fix: update celo subgraph * fix: update v3-sdk and smart-order-router versions * fix: move Celo to the bottom of the network selector list * fix: downgrade smart-order-router and add casting fix * fix: downgrade smart-order-router and add casting fix * fix: resolve Pool dependency * fix: bridge chain id types * fix: explorer link test * fix: use quoter v2 ABI in useClientSideV3Trade fro Celo * fix: update connection "infura_rpc" to networks * fix: revert yarn.lock and force install * fix: dedup router and v3 sdk * refactor: mv quoter v2 to client side v3 trade * build: dedup lockfile * feature: add portal ether to common bases * fix: add comment for chains that use QuoterV2 * fix: use token as native asset * fix: supply correct factory address to getPoolAddress call & refactor nativeOnChain method * feature: adjust celo tokens presetned * fix: update celo explorer to celoscan * fix: celo token casting * fix: celo celo explorer it * fix: celo chain info should be consistent with block explorer used. Co-authored-by: Zach Pomerantz <zzmp@uniswap.org> * fix: revert "fix button jump on currency panel" (#4083) fix padding * fix: unsupported chain displays message instead of crash (#4054) * made initial changes for pools page displaying w/ unsupported chains * condensed styling * added chain validation to CTACards and wrote tests for both CTAcards and Pools page * linted changes * switched from snapshot to text matching tests * switched test to use check for text instead of testid * fix: add crossplatform `prei18n-extract` script (#3728) * fix: 🐛 add crossplatform `prei18n-extract` script * fix: 🚨 add newline * Revert "fix: 🐛 add crossplatform `prei18n-extract` script" This reverts commit 201bd23. * build: 📦 add `shx` as dev dep, use it in `prei18n:extract` script * fix: 🐛 use platform-specific commands for prei18n-extract * chore(i18n): new Crowdin translations (#4084) chore(i18n): synchronize translations from crowdin [skip ci] Co-authored-by: Crowdin Bot <support+bot@crowdin.com> * feat: implement trace framework for analytics (#4060) * init commit * add amplitude ts sdk to package.json * add more comments and documentation * respond to vm comments * respond to cmcewen comments * fix: remove unused constants * init commit * adapt to web * add optional event properties to trace * correct telemetry to analytics * change telemetry to analytics in doc * fix: respond to cmcewen comments + initialize analytics in app.tsx + add missing return statement * respond to zzmp comments * fixes * eliminate unnecessary state * respond to part of zzmp comments * respond to zzmp comments round 2 * fixes * respond to zzmp comments * refactor: wallet specific Option components (#4065) * refactor: wallet specific Option components * fix * fix * fix coinbase wallet logic * injected logic * remove wallet.ts * install metamask * move all into InjectedOption * fix mobile metamask * wip * more mocking * more test fixes * refactor * more special casing * isMetaMask * simplify components * fix imports * fix coinbase wallet * test fix * fix connectors changing * Revert "fix connectors changing" This reverts commit 2acfe64. * more to typescript logic instead of jsx * chore(i18n): new Crowdin translations (#4090) * build: upgrade @typescript-eslint (#4095) build: update @typescript-eslint * build: update caniuse-lite (#4093) * test: enforce deps deduplication (#4097) * build: use fewer babel versions * build: dedup * test: test deps dedups * fix: test.yml * fix: typo * test: failing * fix: dedup * fix: dedup * test: comment dedup tests * chore: whitespace * feat: implement token selector events (#4067) * init commit * add amplitude ts sdk to package.json * add more comments and documentation * respond to vm comments * respond to cmcewen comments * fix: remove unused constants * init commit * adapt to web * add optional event properties to trace * correct telemetry to analytics * change telemetry to analytics in doc * fix: respond to cmcewen comments + initialize analytics in app.tsx + add missing return statement * init commit * respond to zzmp comments * add token selected event * fixes * eliminate unnecessary state * respond to part of zzmp comments * respond to zzmp comments round 2 * fixes * respond to zzmp comments * add imported token event and other fixes * also log onKeyPress for suggested tokens * respond to cmcewen comments * chore: updates web3-react, adds key for changing connector order (#4085) * fix connectors changing * update package * add connection name * rename file * de-dupe * cb wallet fix * fix * yarn change * log the key * re-order connections * memoize the key * some updates * rm console * prevent memory leak Co-authored-by: Noah Zinsmeister <noahwz@gmail.com> * feat: implement-page-viewed-event-for-all-main-pages-of-app (#4089) * init commit: initial constants for pages, implement vote page viewed * implement swap * implement pool * remove charts * simplify shouldLogImpression * chore: upgrade to react 18 (#3992) * chore: upgrade to react 18 * fix: update tests * fix: fix lint issues and remove unnecessary react hooks testing library * fix: add types for stricter typescript checks * fix: fix additional typescript check issues * fix: revert to prev commmit * rebase * rebase * fix: fix lint issues and remove unnecessary react hooks testing library * fix: add types for stricter typescript checks * fix: fix additional typescript check issues * rebase * fix: rebase * fix * eslint fix * fix: package.json changes * fix: package.json changes * fix yarn lock * fix version package.json * fix: downgrade react-router-dom to original * fix: undo modification of .github/workflows/release.yaml * fix: revert cypress testing version update * rebase * rebase * fix: fix lint issues and remove unnecessary react hooks testing library * fix: add types for stricter typescript checks * fix: fix additional typescript check issues * rebase * chore: upgrade to react 18 * fix: update tests * fix: fix lint issues and remove unnecessary react hooks testing library * fix: add types for stricter typescript checks * fix: fix additional typescript check issues * fix * eslint fix * fix: package.json changes * fix: package.json changes * fix yarn lock * fix version package.json * fix: downgrade react-router-dom to original * fix: undo modification of .github/workflows/release.yaml * fix: revert cypress testing version update * fix * fix: error boundary change * yarn.lock change * fix: cypress tests finally passing due to zzmp redux multicall fix HOORAY * undo service worker changes * build: dedup lockfile * yarn.lock + lint * update snapshot tests * checkpoint * yarn.lock * fix: fix type errors during build * fixes * fix yarn.lock * dedup yarn * fix: import react components explicitly instead of all of react * dedup * yarn.lock * yarn.lock * dedup * yarn * dedup * dedupe use-sync-external-store * fix build issues * dedup use-sync-external-store Co-authored-by: Zach Pomerantz <zzmp@uniswap.org> * chore(web3-react): fix connectEagerly for MetaMask mobile (#4101) * chore(web3-react): fix connectEagerly for MetaMask mobile * fix * build: pause deploy (#4102) * fix: update styled-components in package.json to latest to remove react invalid hook call warnings (#4103) * fix warning vig found by updating styled-components * revert unnecessary yarn.lock changes * reduce unnecessary changes * dedup * manual fix and dedup of yarn.lock * manually dedup @emotion/is-prop-valid * update snapshot tests * build: upgrade prettier to v2.7.1 (#4109) * style: prettier based on v2.2 * 2.7.1 instead? * npx * ^ * refactor: adding safe getter for ChainInfo (#4110) * replaced CHAIN_INFO access with a function call * updated CTACard tests to work with getChainInfo * updated typechecking, removed console.log * build: Revert "build: pause deploy" (#4107) * Revert "build: pause deploy (#4102)" This reverts commit 3a1ea3d. * prettier * refactor: remaining changes from the large celo merge (#4088) * refactor: useUSDCValue -> useStablecoinValue * refactor: use the isCelo() helper * refactor: remove unneeded white space * chore: upgrades react-router-dom, fixes dev-mode linking (#4115) * fix: stale route * fix: add e2e test * fix: update e2e test * fix: fixes Popover arrow positioning (#4119) fix: fix arrow position * build: don't fail cypress on unhandled exception (#4122) * fix: catch vibrant failure (#4123) fix: catch CORS error * feat: enable 1bp optimism fee tier (#4124) enable new optimism fee tier * chore: move prettier, jest-styled-components to devDependencies (#4128) * change package * yarn.lock * feat: implement connect wallet category events (#4111) * init commit * wallet connected event init commit * add received_swap_quote event property * add page context, connect wallet event log * add received_swap_quote property * fix typo * respond to cmcewen comments * respond to vm comments * move trace to app.tsx from header * respond to vm comments * build: change project name to @uniswap/interface (#4125) * fix: increase celo blocksPerFetch to 5 to improve interface performance (#4130) * init commit * revert yarn.lock changes * update test snapshots * build: lock jest-styled-components@7.0.7 (#4132) * fix: don't toggle desktop NetworkSelector on click (#4134) fix: don't NetworkSelector onClick on desktop * chore: access router data with hooks (#4121) * chore: access router data with hooks * chore: clean RouteComponentProps * chore: use children instead of render * add import * test: fix swap test flake (#4135) * remove all the funky logic * clear stuff * uncomment some tests * remove expert mode tests * skip these tests again, smh * fix: sync chain query parameter (#4019) * replaceURLChain * reorder stuff * don't use usePrevious for previousChainId * remove the replace param call in promise * variable names * comment * confirm isActive * wrong place for isActive * change ret type * add comments * check if not previous chain id * fix: unused onClickOutside reference (#4140) * refactor: clean floating Route (#4144) * fix: increase Polygon gas limit (#3882) * Update graph link * Add Gas over ride temp for Polygon * removal of personal tweaks * Update index.tsx * reset to original file * missing EOL * Update useClientSideV3Trade.ts * remove space * fix: add celo gas override (#4147) fix: add celo gas override to circumvent 'out of gas' error from multicall * build: add global jest-styled-components config (#4148) * add test.config.ts * don't need per file * comment * ts -> js * rm test.config.js? * update snapshots * update jest-styled-components * style: Adds "deprecated_" prefix to all non-theme colors (#4146) * Add deprecated_ label to white and black * Add deprecated_ label to text1 through text5 * Add deprecated_ label for bg0 through bg6 * Add deprecated_ prefix to remaining colors * Add deprecated_ prefix to direct style references * Add deprecated_ prefix to all remaining colors * Update link color * Fix 'deprecated_white' -> theme.deprecated_white * Update snapshots * style: updating ui on unsupported network (#4138) * initial changes * disabled all swap ui buttons when on unsupported chain * implementing Cal's requests to change sizing and copy on pools * updated snapshots * reverted changed snapshots * updated unsupported network test * fixing deprecated colors missing * build: only test for highest yarn-deduplicate strategy (#4154) * build: only test for highest yarn-deduplicate strategy * remove exclusions * fix: fix swap details expanded not working on local build (#4156) fix swap details expanded not working * refactor: remove unused SwapPoolTabs (#4159) * chore: clean useless code * clean unused code * chore(i18n): new Crowdin translations (#4155) chore(i18n): synchronize translations from crowdin [skip ci] Co-authored-by: Crowdin Bot <support+bot@crowdin.com> * feat: implement other swap events part 1 (#4151) * init commit * fix prettier errors * check node env in vercel * add shouldLogImpression to TraceEvent * chore: upgrade cypress (#4161) * chore: upgrade cypress * 10.3.1 * feat: add updated theme colors (#4141) * add colors * Update settings.json * Update settings.json * remove comments * rename * feat: Web 214 implement the main submit swap event (#4061) * init commit * add amplitude ts sdk to package.json * add more comments and documentation * respond to vm comments * respond to cmcewen comments * fix: remove unused constants * init commit * adapt to web * add optional event properties to trace * correct telemetry to analytics * init commit * change telemetry to analytics in doc * init commit * fix: respond to cmcewen comments + initialize analytics in app.tsx + add missing return statement * add element name constant * init commit * correct price_impact calculation * resolve vm comments * fixes in response to comments * respond to vm * use ALL significant digits for token amounts * create helper function getPriceImpactPercentageNumber * 4 decimal points for percentages * change percentage to basis points units * feat: implement swap quote received event (#4165) * init commit * add amplitude ts sdk to package.json * add more comments and documentation * respond to vm comments * respond to cmcewen comments * fix: remove unused constants * init commit * adapt to web * add optional event properties to trace * correct telemetry to analytics * init commit * change telemetry to analytics in doc * init commit * fix: respond to cmcewen comments + initialize analytics in app.tsx + add missing return statement * add element name constant * init commit * correct price_impact calculation * resolve vm comments * fixes in response to comments * respond to vm * use ALL significant digits for token amounts * init commit * logged all properties * create helper function getPriceImpactPercentageNumber * 4 decimal points for percentages * price percentage fn * only log event on FIRST price fetch * respond to cmcewen comments * fix: scroll to top only when pathname changes (#4180) * fix: Update V2 Pool Document link (#4188) Update V2 Pool Document link Current link line 163 point to old documents, and gives error page changed to https://docs.uniswap.org/protocol/V2/concepts/core-concepts/pools current version of pool documents for V2 * fix: updated external docs link for Propose (#4186) FIxed Propose External Docs Link * chore: upgrade react-router-dom to v6 (#4143) * chore: upgrade react-router-dom to v6 * migrate Redirect to Navigate * use Routes instead of Switch * migrate useHistory to useNavigate * use To type * use element * work around activeClassName * fix typing for useParams * deduplicate * fix Navigate * add e2e tests * visit /swap directly Co-authored-by: Vignesh Mohankumar <me@vig.xyz> * style: Add Deprecated prefix to ThemedText components (#4192) * Add Deprecated prefix to ThemedText components * Fix lint errors * fix: update critical red HEX (#4191) change red * feat: Web 262 user model custom properties first PR (#4190) * init commit * abstract amplitude stuff away to separate function * feat: remaining swap events (#4169) * init commit * add amplitude ts sdk to package.json * add more comments and documentation * respond to vm comments * respond to cmcewen comments * fix: remove unused constants * init commit * adapt to web * add optional event properties to trace * correct telemetry to analytics * init commit * change telemetry to analytics in doc * init commit * fix: respond to cmcewen comments + initialize analytics in app.tsx + add missing return statement * add element name constant * init commit * correct price_impact calculation * resolve vm comments * fixes in response to comments * respond to vm * use ALL significant digits for token amounts * init commit * logged all properties * create helper function getPriceImpactPercentageNumber * 4 decimal points for percentages * price percentage fn * only log event on FIRST price fetch * init commit * add swap transaction completed event * respond to cmcewen comments * add two events * remove console.logs * move transaction completed logging to reducer * simplify and remove unnecessary logic and constants * respond to cmcewen comments * respond to cmcewen comments * respond to vm comment * feat: add time / duration based event properties to swap events (#4193) * init commit * remove absolute value in date calc * all the events are now logged properly plus changed native token address to NATIVE * add documentation line * remove unnecessary prop * respond to vm comments * merge and rename util method * respond to vm comments again * feat: fetch stablecoin price with SOR, PI warning (#4217) * feat: fetch stablecoins price with SOR, PI warning * calculate realized price impact * remove unrelated changes * dupe import * pr feedback * use the same calculation function for PI * use proper var * feat: update unsupported token list (#4219) * feat: new swap events and properties in taxonomy (#4204) * init commit * remove absolute value in date calc * all the events are now logged properly plus changed native token address to NATIVE * add documentation line * remove unnecessary prop * init * add approve token event * fix build * add route event properties * fix build * respond to vm comments * respond to vm comments * remove routes properties * feat(risk): tune down cache (#4208) * tune down cache from 7 days to 12 hours * minimal cache time * fix: hide text cursor on network selector hover (#4249) Dont' show text cursor when hovering over network dropdown text * feat: initial FeatureFlagProvider (#4248) * initial * add to index * show more logic * split up * nvm combine * combine more * loading state for the app * no conditional * rm var * comment * move comment * add control specifically * feat: amplitude logs is_reconnect (#4214) * modified redux state to track wallet connections to properly log reconnects * linted and removed console.log * fixes for lynn's comments + documenting * fix: update SOR to refundETH on high price impact ETH trades (#4251) fix lock * feat: theme color updates under feature flag (#4252) * toggle * fixed position * im bad at spelling * rm button * fix * add feature flag * naming * rm blue5 * uppercase * rm file * attempting to resolve some theme/unused var issues Co-authored-by: Anas Yousef <anas.y0807@gmail.com> Co-authored-by: Vignesh Mohankumar <vignesh@vigneshmohankumar.com> Co-authored-by: Jesse <31524583+Jesse-Sawa@users.noreply.github.com> Co-authored-by: Zach Pomerantz <zzmp@uniswap.org> Co-authored-by: Kaylee George <62825936+kayleegeorge@users.noreply.github.com> Co-authored-by: cartcrom <39385577+cartcrom@users.noreply.github.com> Co-authored-by: Bruno Crosier <bruno.crosier@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Crowdin Bot <support+bot@crowdin.com> Co-authored-by: lynn <41491154+lynnshaoyu@users.noreply.github.com> Co-authored-by: Noah Zinsmeister <noahwz@gmail.com> Co-authored-by: Sam Chen <chenxsan@gmail.com> Co-authored-by: Rachel-Eichenberger <60412342+Rachel-Eichenberger@users.noreply.github.com> Co-authored-by: Daniel James <danielcolinjames@gmail.com> Co-authored-by: Akshit Choudhary <akshitchoudhary007@gmail.com> Co-authored-by: Vignesh Mohankumar <me@vig.xyz> Co-authored-by: Connor McEwen <connor.mcewen@gmail.com> Co-authored-by: matteenm <105068213+matteenm@users.noreply.github.com> Co-authored-by: David Walsh <davidwalsh83@gmail.com> Co-authored-by: Emily Williams <emag3m@gmail.com>
- Loading branch information
21 people
committed
Aug 3, 2022
1 parent
cd0e864
commit 13aadb7