2440/uni merge #2536

alfetopito · 2022-03-10T23:22:21Z

Summary

(recreating from #2529)

Closes #2440

Merge with latest from original UNI code

PR deployment URL https://pr2536--gpswapui.review.gnosisdev.com/

TO DOs

List of things that I know we should look at. There might be more...

To Test

TEST EVERYTHING!!

* Revert "chore: import from ethers" This reverts commit 6d9c0855d261679c316307ea3f668869c90e63a2. * Revert "fix: use provider JsonRpcProvider" This reverts commit dcbbab5e4d6458a11c38582388a7cb5b12691188. * chore: depend on @ethersprojects directly

…ovider error (#3107)

…ssing provider error (#3107)" (#3109) This reverts commit ac2642f.

* feat: mv block number to atom * fix: add block updater * fix: fast forward dep

* feat: mv block number to atom * fix: add block updater * fix: fast forward dep * refactor: mv multicall to lib * feat: add multicall to widget * chore: update widget deps * nit: pluralize updaters * chore: minimize deps

* refactor: mv token list utils to lib * refactor: mv balance hooks to lib * feat: interactive token select

* refactor: mv gas estimate chains out of component * chore: replace microbundle with rollup * chore: use ts rollup config * chore: rename lib to widgets * chore: add rollup doc comment * feat: rollup typings * fix: retain tsconfig decl dir

* add survey popup for survey monkey * update useEffect and add 24 hour window * upate % logic * update logic to show after duration * update timestamp conditional * small changes

* refactor: mv useNativeCurrency to lib/hooks * refactor: mv useCurrency logic to lib/hooks

* fix: token image for chains / natives * feat: include native currency in select - Updates widgets swap state to use Currency (and deals with downstream updates) - Refactors logoURI code to a new lib/hooks/useCurrencyLogoURIs - Adds native currency to useQueryTokenList NB: This does not build because tests must be updated to use Currency (they currently use mock tokens) * test: update fixtures to use real currency * fix: data uri color extraction * fix: token img state * fix: use new array

* fix: memoize derived swap info * fix: memoize current block timestamp * fix: memoize price impact * fix: memoize debounced value updates * fix: nits

… and Missing provider error (#3110) * add error reporting component, INTEGRATION ERROR type, and Missing provider error * rename reporter to generator * pr feedback * refactor provider check * add chainId, convenienceFee, and width errors * pr feedback and convenienceFeeRecipient address enforcement * fix imports for utils

…ction (#3153)

* refactor: mv settings state to own file * chore: add default exports * refactor: update swap state to match biz logic * feat: copy biz logic to widgets * Hook up UI to updated swap state * fix: decimal inputs * fix max slippage * fix error in settings * fix: typing errors * revert: useBestTrade changes * fix: use client side trade for widgets * fix: exhaustive deps * chore: add router-sdk * fix: gate old web3 on widget env * fix building errors * update trade imports * update hook naming for swap amount and currencies * small changes Co-authored-by: Zach Pomerantz <[email protected]>

* feat: filter selected currency from select * test: use infura urls * fix: load native with chain * fix: use currencyId for key * feat: switch currencies when selecting other * fix: resolve merge conflict name

W3stside · 2022-04-01T11:59:41Z

.env

@@ -72,3 +72,6 @@ REACT_APP_PATH_REGEX_ENS="/ipfs"

 # Enables mock mode (default = true)
 REACT_APP_MOCK=true
+
+# Locales
+REACT_APP_LOCALES="locales"


this is already concerning, why is .env no longer ignored?

W3stside · 2022-04-01T12:00:26Z

.eslintrc.json

  "rules": {
+    "unused-imports/no-unused-imports": "error",
+    //    "simple-import-sort/imports": "error",


they removed this or we did? tbh i always liked this rule but it can get noisy

W3stside · 2022-04-01T12:01:38Z

.github/workflows/ci.yml

+          prettier: true
+
+      - name: Run eslint
+        if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.owner.login != github.repository_owner }}


weird rule, don't run eslint if the owner is opening a PR?

W3stside · 2022-04-01T12:02:27Z

cosmos.config.json

+    "configPath": "react-scripts/config/webpack.config",
+    "overridePath": "cosmos.override.js"
+  },
+  "port": 5001


so cosmos stuff willa lso be run on yarn start? seems bulkier. but ill give it a go later. just a note

W3stside · 2022-04-01T12:03:22Z

cypress-custom/support/commands.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="cypress" />
+/// <reference types="Cypress" />


W3stside · 2022-04-01T12:04:58Z

package.json

-    "web3-providers-ws": "^1.7.0",
+    "typescript": "^4.4.3",
+    "web3-react-abstract-connector": "npm:@web3-react/abstract-connector@^6.0.7",
+    "web3-react-core": "npm:@web3-react/core@^6.0.9",


whta's this npm prepending going on?

W3stside · 2022-04-01T12:05:47Z

package.json

+    "web3-react-injected-connector": "npm:@web3-react/injected-connector@^6.0.7",
+    "web3-react-portis-connector": "npm:@web3-react/portis-connector@^6.0.9",
+    "web3-react-types": "npm:@web3-react/types@^6.0.7",
+    "web3-react-walletconnect-connector": "npm:@web3-react/walletconnect-connector@^7.0.2-alpha.0",


beta connector in use, differs quite alot from v6

W3stside · 2022-04-01T12:08:05Z

package.json

+    "@web3-react/empty": "8.0.7-beta.0",
+    "@web3-react/fortmatic-connector": "^6.1.6",
+    "@web3-react/injected-connector": "^6.0.7",
+    "@web3-react/metamask": "8.0.10-beta.0",


sorry made a mistake above, these are all the latest connectors

W3stside · 2022-04-01T12:10:44Z

src/components/AddressInputPanel/index.tsx

 // eslint-disable-next-line no-restricted-imports
-import { t, Trans } from '@lingui/macro'
+import { t } from '@lingui/macro'


should combine these, is this a mistake?

elena-zh · 2022-04-01T13:20:47Z

Hey @alfetopito , great job!
I have done a round of PR testing and reported related issues:

Besides these issues, I'd like to leave here some notes:

I have not fully tested Profile page as it should be updated according to the latest changes
I have some doubts in displaying WETH-USDC token pair b default. Seems like the app forces me immediately to trade with these tokens. Besides. when switch to Rinkeby, it shows an incorrect price.. So I'd leave TO field empty as we do currently in Prod. However, I do not insist on it
I see a lot of errors in the Console. Seems like it is totally red

Thanks!

stale · 2022-06-12T14:42:21Z

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs.
If you think it shouldn't be closed, speak now or forever hold your peace.

crowdin-bot and others added 30 commits January 11, 2022 21:06

chore(i18n): synchronize translations from crowdin [skip ci]

83b70f3

chore: bump sor to 2.5.10 (#3091)

aa97ec0

refactor: split chain info from chains (#3105)

f3bcf64

refactor: separate useActiveWeb3React (#3106)

ac962fb

add error reporting component, INTEGRATION ERROR type, and Missing pr…

ac2642f

…ovider error (#3107)

Revert "add error reporting component, INTEGRATION ERROR type, and Mi…

06a8151

…ssing provider error (#3107)" (#3109) This reverts commit ac2642f.

feat: mv block number to atom (#3108)

7aa0f50

* feat: mv block number to atom * fix: add block updater * fix: fast forward dep

feat: add multicall to widget (#3112)

8784a76

* feat: mv block number to atom * fix: add block updater * fix: fast forward dep * refactor: mv multicall to lib * feat: add multicall to widget * chore: update widget deps * nit: pluralize updaters * chore: minimize deps

feat: sort the widget token select (#3114)

e68e1af

* refactor: mv token list utils to lib * refactor: mv balance hooks to lib * feat: interactive token select

chore(i18n): synchronize translations from crowdin [skip ci]

064a73c

chore(i18n): synchronize translations from crowdin [skip ci]

5d97cbf

feat: add survey popup for survey monkey (#3116)

1b10c88

* add survey popup for survey monkey * update useEffect and add 24 hour window * upate % logic * update logic to show after duration * update timestamp conditional * small changes

update end timestamp for survey (#3121)

27843f6

chore(i18n): synchronize translations from crowdin [skip ci]

1127e74

refactor: mv token hooks to lib (#3122)

99f6818

* refactor: mv useNativeCurrency to lib/hooks * refactor: mv useCurrency logic to lib/hooks

fix: memoize more swap (#2950)

d54783a

* fix: memoize derived swap info * fix: memoize current block timestamp * fix: memoize price impact * fix: memoize debounced value updates * fix: nits

chore(i18n): synchronize translations from crowdin [skip ci]

fd81926

refactor: mv try parse currency amount to lib utils (#3152)

1efda07

show wrong chain message instead of throwing on incorrect chain conne…

5dec0cf

…ction (#3153)

chore(i18n): synchronize translations from crowdin [skip ci]

c3321ae

chore(i18n): synchronize translations from crowdin [skip ci]

b77e7de

fix: update address listt (#3159)

053000e

chore(i18n): synchronize translations from crowdin [skip ci]

8a37c42

fix: chain mismatched currencies (#3163)

567fb01

feat: polish select (#3160)

b501974

* feat: filter selected currency from select * test: use infura urls * fix: load native with chain * fix: use currencyId for key * feat: switch currencies when selecting other * fix: resolve merge conflict name

elena-zh mentioned this pull request Apr 1, 2022

2440/uni merge: remove 'in the dropdown menu' from the Wrong Network message #2645

Open

W3stside reviewed Apr 1, 2022

View reviewed changes

elena-zh mentioned this pull request Apr 4, 2022

Merge Uniswap cowprotocol/cowswap#282

Closed

stale bot added the wontfix Stale issue label Jun 12, 2022

alfetopito closed this Jun 17, 2022

alfetopito deleted the 2440/uni-merge branch June 17, 2022 15:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

2440/uni merge #2536

2440/uni merge #2536

alfetopito commented Mar 10, 2022 •

edited

Loading

W3stside Apr 1, 2022

W3stside Apr 1, 2022

W3stside Apr 1, 2022

W3stside Apr 1, 2022

W3stside Apr 1, 2022

W3stside Apr 1, 2022

W3stside Apr 1, 2022

W3stside Apr 1, 2022

W3stside Apr 1, 2022

elena-zh commented Apr 1, 2022

stale bot commented Jun 12, 2022

		@@ -1,4 +1,4 @@
		/// <reference types="cypress" />
		/// <reference types="Cypress" />

2440/uni merge #2536

2440/uni merge #2536

Conversation

alfetopito commented Mar 10, 2022 • edited Loading

Summary

TO DOs

To Test

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

elena-zh commented Apr 1, 2022

stale bot commented Jun 12, 2022

alfetopito commented Mar 10, 2022 •

edited

Loading