[:unicorn: Uniswap Merge] - imports delight #1982

nenadV91 · 2021-12-08T22:51:41Z

Summary

Closes our commander Uniswap backmerge task

Updates us to v4.20.2

Test

🔭 GP Swap: Gnosis Protocol v2 Swap UI

Tasks

Merge and resolve conflicts
Fix issues with styles in modals
Fix issue with missing wallet icons in header
Implement new NetworkSelector component

Overview

WIP

* chore: change language icon to globe

redux-devtools-extension integration is already provided through @reduxjs/toolkit.

* fix: remove the walletconnect bridge url * fix: use the latest ethereum provider which fixes the optimism rainbow issue

reconfigure service workers to only cache used assets (excluding .po language files and non-.var.woff2 font files) * fix: turn service workers back on * chore: configure service worker caches * chore: add newline * Fix code style issues with ESLint * chore: limit service-worker caching Co-authored-by: Zach Pomerantz <[email protected]> Co-authored-by: Lint Action <[email protected]>

* upgrade to 7.0 * first iteration of stubbing subgraph in integration tests * added fixtures * add tests for fee tier distribution and liquidity chart * remove unused test utils * update yarn.lock * fixed merge artifacts

* fix(governance): special case bravo parsing * fix(governance): explicitly parse U+2018, U+2026 * chore: upgrade ethers to ^5.4.6 Updates parseLog to delay parsing nested properties, so that they will only fail when accessed. * fix(vote): recover from invalid UTF-8 in proposal descriptions * fix(vote): special case bravo proposal newlines * chore: rm dead reference

This reverts commit 00403a4.

Bumps [tar](https://github.com/npm/node-tar) from 6.1.4 to 6.1.11. - [Release notes](https://github.com/npm/node-tar/releases) - [Changelog](https://github.com/npm/node-tar/blob/main/CHANGELOG.md) - [Commits](isaacs/node-tar@v6.1.4...v6.1.11) --- updated-dependencies: - dependency-name: tar dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix: Object.fromEntries polyfill * fix: update polyfills * fix: update polyfills

* chore: upgrade type system Upgrade types, typescript, and formatters. * fix: ListsState tests

Adds a en-space to StyledPollingNumber so it is always painted. Fixes a layout shift when rendering the first block number. StyledPollingNumber is taller than its container, so waiting to paint it causes a layout shift when rendering.

Avoids a flash of "Select a token" as the App initializes.

* first pass * Fix code style issues with ESLint * address comments Co-authored-by: Lint Action <[email protected]>

commit 5f1d1af62bcd47286aafacc18788f4e7e22dd7c0 Author: Aseem Sood <[email protected]> Date: Fri Sep 3 12:12:39 2021 -0400 update readme tweak commit 80a5b95c0e0ae8934b5591c982077eaa813db747 Author: Noah Zinsmeister <[email protected]> Date: Fri Sep 3 11:52:56 2021 -0400 consolidate and standardize unsupported tokens

alfetopito

Reviewed files from 202 to 314

custom/utils/blocknative - check whether they export their typings
src/index

alfetopito · 2021-12-16T17:05:16Z

src/custom/pages/Swap/SwapMod.tsx

@@ -85,7 +85,7 @@ import { formatSmart } from 'utils/format'
 import { RowSlippage } from 'components/swap/TradeSummary/RowSlippage'
 import usePrevious from 'hooks/usePrevious'
 import { StyledAppBody } from './styleds'
-import { ApplicationModal } from 'state/application/actions'
+import { ApplicationModal } from '@src/state/application/reducer'


Do you have to import from @src? In other places you didn't

alfetopito · 2021-12-16T17:13:58Z

src/custom/state/swap/hooks.ts

@@ -37,7 +38,7 @@ import TradeGp from './TradeGp'
 import { SupportedChainId as ChainId } from 'constants/chains'
 import { WETH9_EXTENDED as WETH, GpEther as ETHER } from 'constants/tokens'

-import { BAD_RECIPIENT_ADDRESSES } from 'state/swap/hooks'
+import { BAD_RECIPIENT_ADDRESSES } from '@src/state/swap/hooks'


Do you have to use @src?

alfetopito · 2021-12-16T17:15:59Z

src/custom/state/swap/hooks.ts

@@ -422,10 +428,10 @@ export function queryParametersToSwapState(parsedQs: ParsedQs, defaultInputCurre

  return {
    [Field.INPUT]: {
-      currencyId: inputCurrency,
+      currencyId: inputCurrency === '' ? null : inputCurrency ?? null,


I understand this is coming from the merge but, hum?

Am I reading this wrong or is this equivalent to inputCurrecy || null ?

sure seems loik it

alfetopito · 2021-12-16T17:31:10Z

src/hooks/useERC20Permit.ts

@@ -114,7 +115,7 @@ const PERMIT_ALLOWED_TYPE = [
  { name: 'allowed', type: 'bool' },
 ]

-export function useERC20Permit(
+function useERC20Permit(


Will probably need the export?

alfetopito · 2021-12-16T17:31:39Z

src/hooks/useFetchListCallback.ts

 import { useAppDispatch } from 'state/hooks'
+
+import { getNetworkLibrary } from '../connectors'


Keep absolute import?

alfetopito · 2021-12-16T17:36:22Z

src/hooks/useIsSwapUnsupported.ts

@@ -1,6 +1,7 @@
 import { Currency, Token } from '@uniswap/sdk-core'
 import { useMemo } from 'react'
-import { useUnsupportedTokens } from 'hooks/Tokens'
+
+import { useUnsupportedTokens } from './Tokens'


Keep absolute import?

alfetopito · 2021-12-16T17:49:43Z

src/index.tsx

 function Updaters() {
  return (
    <>
      <RadialGradientByChainUpdater />
      <ListsUpdater />
      <UserUpdater />
      <ApplicationUpdater />
+      <TransactionUpdater />


Should we keep this updater?
Maybe we already disabled, but should check

alfetopito

Checked the final ~100 files

state/application/actions - make sure behaviour is still needed and captured elsewhere
state/transactions/actions - new transaction types
utils/addnetwork - is it useful for us?
utils/gettokenlists - lazy loading dependencies, we could reuse it for other stuff

alfetopito · 2021-12-16T18:01:57Z

src/pages/App.tsx

@@ -6,10 +6,10 @@ import AddressClaimModal from '../components/claim/AddressClaimModal'
 import ErrorBoundary from '../components/ErrorBoundary'
 import Header from '../components/Header'
 import Polling from '../components/Header/Polling'
-import Popups from 'components/Popups'
+import Popups from '../components/Popups'


Keep import

alfetopito · 2021-12-16T18:04:33Z

src/pages/Swap/index.tsx

 import UnsupportedCurrencyFooter from 'components/swap/UnsupportedCurrencyFooter'
-import { MouseoverTooltip, MouseoverTooltipContent } from 'components/Tooltip'
+import { MouseoverTooltip, MouseoverTooltipContent } from '@src/components/Tooltip'


Need @src?

alfetopito · 2021-12-16T18:04:54Z

src/pages/Swap/index.tsx

 import AddressInputPanel from '../../components/AddressInputPanel'
-import { ButtonConfirmed, ButtonError, ButtonGray, ButtonLight, ButtonPrimary } from 'components/Button'
+import { ButtonConfirmed, ButtonError, ButtonLight, ButtonPrimary } from '../../components/Button'


Probably keep imports

alfetopito · 2021-12-16T18:08:18Z

src/state/application/hooks.ts

-import { useActiveWeb3React } from 'hooks/web3'
-import { AppState } from 'state'
-import { addPopup, ApplicationModal, PopupContent, removePopup, setOpenModal } from 'state/application/actions'
+import { useAppDispatch, useAppSelector } from '@src/state/hooks'


Need @src?

alfetopito · 2021-12-16T18:08:38Z

src/state/application/hooks.ts

+import { useAppDispatch, useAppSelector } from '@src/state/hooks'
+
+import { useActiveWeb3React } from '../../hooks/web3'
+import { AppState } from '../index'


Relative imports

src/state/wallet/hooks.ts

src/theme/components.tsx

src/utils/index.ts

src/utils/retry.ts

alfetopito · 2021-12-16T18:47:26Z

tsconfig.json

    "baseUrl": "src"
  },
  "exclude": [
    "node_modules",
    "cypress"
  ],
  "include": [
-    "src"
+    "src/**/*"


Do you need this?

nenadV91 · 2021-12-17T13:44:29Z

I've adjusted react-cosmos config so its working in our app and also added examples for 2 components. To use this you can run yarn run cosmos and it will start a server on http://localhost:5000/ where you can preview the components. Basically to add some component to cosmos you create a fixtures folder or a file with .fixture.tsx name. I don't know if we want to use it or not but now we can and know how.

elena-zh · 2021-12-20T13:42:21Z

Hey @nenadV91 , great job!
The vast majority of issues is fixed now.

Remaining:

It would be great to remove 'Auto Router' from the settings in a mobile view
Case with network switching in mobile MM integrated browser is still here: The app seems to be disconnected when switch a network in MM injected browser. So it would be great to force the app reloading after a network switching. But let me know if I need to create a low-prio separate issue for this

disc.mp4

Just to be on the same page for the network switcher. Currently, it works great besides the part of the logic when we are connected to a wallet using WC: the switcher is disabled in this case, Should we leave it as it is? @anxolin , @biocom , @alfetopito ?

elena-zh · 2021-12-20T13:54:57Z

Case with network switching in mobile MM integrated browser is still here: The app seems to be disconnected when switch a network in MM injected browser. So it would be great to force the app reloading after a network switching. But let me know if I need to create a low-prio separate issue for this

Actually, I have created #2019 bug as it is not only related to MM wallet. Besides, the issue is reproducible on Prod now.

alfetopito · 2021-12-21T11:00:08Z

It would be great to remove 'Auto Router' from the settings in a mobile view

Auto router section should be hidden everywhere as we do not have that option on our side.

nenadV91 · 2021-12-21T11:11:47Z

Auto-router is removed now

alfetopito

Few more things, ignore if you already checked and they are not needed.

alfetopito · 2021-12-21T12:14:28Z

src/components/Popups/PopupItem.tsx

@@ -16,7 +17,7 @@ export const StyledClose = styled(X)`
    cursor: pointer;
  }
 `
-export const Popup = styled.div`
+const Popup = styled.div`


Keep this one also?

alfetopito · 2021-12-21T12:28:14Z

src/components/TransactionConfirmationModal/index.tsx

+import { ExternalLink } from '../../theme'
+import { CloseIcon, CustomLightSpinner } from '../../theme/components'


Import on these 2 lines

alfetopito · 2021-12-21T12:28:56Z

src/components/TransactionSettings/index.tsx

-import { TYPE } from 'theme'
+import { TYPE } from '../../theme'


alfetopito · 2021-12-21T12:29:25Z

src/components/TransactionSettings/index.tsx

 import { Percent } from '@uniswap/sdk-core'
+import { L2_CHAIN_IDS } from '@src/constants/chains'


alfetopito · 2021-12-21T12:34:54Z

src/custom/components/Identicon/IdenticonMod.tsx

 import { IdenticonProps } from 'components/Identicon'

+import { useActiveWeb3React } from '../../hooks/web3'


alfetopito · 2021-12-21T12:44:38Z

src/custom/constants/chains/chainsMod.ts

  }, */
+  [SupportedChainId.XDAI]: {
+    docs: 'https://docs.uniswap.org/',
+    explorer: 'https://gnosis-protocol.io/xdai',


I know this was there already, but the explorer should be BlockScout rather than our explorer

src/pages/Swap/index.tsx

src/state/application/hooks.ts

src/components/AddressInputPanel/index.tsx

src/components/Badge/index.tsx

W3stside · 2021-12-21T19:06:40Z

src/components/Blocklist/index.tsx


 // SDN OFAC addresses
 const BLOCKED_ADDRESSES: string[] = [
+  '0x7Db418b5D567A4e0E8c59Ad71BE1FcE48f3E6107',


make a note of these blocked addresses please

W3stside · 2021-12-21T19:17:14Z

src/components/Header/index.tsx

@@ -284,7 +290,7 @@ export default function Header() {
        >
          <Trans>Pool</Trans>
        </StyledNavLink>
-        {chainId && chainId === SupportedChainId.MAINNET && (
+        {(!chainId || chainId === SupportedChainId.MAINNET) && (


so no it's if you're not connected or you're on mainnet?

W3stside · 2021-12-21T19:18:52Z

after some minor import changes, looks good to me now, @gnosis/gp-qa anything holding this back?

elena-zh · 2021-12-22T09:19:05Z

@W3stside , @nenadV91 the latest changes LGTM!
The only thing remains is to agree on this point:

Just to be on the same page for the network switcher. Currently, it works great besides the part of the logic when we are connected to a wallet using WC: the switcher is disabled in this case, Should we leave it as it is?

W3stside

Very nice work. Take a break form this for a while 😅

zzmp and others added 30 commits August 19, 2021 16:44

chore: change language icon to globe (#2222)

b833d07

* chore: change language icon to globe

chore(accessibility): increase contrast for connections (#2223)

805af2f

fix(governance): hot fix for parseLog crash

e1f37b0

fix: proposal formatting

1613cc4

chore: rm unused styled-system (#2234)

db18b48

chore: update multicodec usage (#2233)

c2c7d87

chore: remove unused cross-env (#2232)

f3c400c

chore: rm redux-devtools-extension (#2230)

8112e48

redux-devtools-extension integration is already provided through @reduxjs/toolkit.

fix: walletconnect on L2 issues with Rainbow (#2242)

1304acd

* fix: remove the walletconnect bridge url * fix: use the latest ethereum provider which fixes the optimism rainbow issue

test: support stubbing subgraph data in cypress (#2259)

00403a4

* upgrade to 7.0 * first iteration of stubbing subgraph in integration tests * added fixtures * add tests for fee tier distribution and liquidity chart * remove unused test utils * update yarn.lock * fixed merge artifacts

update token list (#2270)

299286a

add arbitrum token list (#2268)

0afeb5a

Revert "test: support stubbing subgraph data in cypress (#2259)" (#2269)

13a289f

This reverts commit 00403a4.

fix: disable serviceworker in integration tests (#2274)

f51335d

update explorer links for arbitrum (#2279)

81b1346

update optimism subgraph url (#2282)

cd50d57

fix: older browser suppport (#2228)

5dfe44d

* fix: Object.fromEntries polyfill * fix: update polyfills * fix: update polyfills

chore: upgrade type system (#2276)

f5557a4

* chore: upgrade type system Upgrade types, typescript, and formatters. * fix: ListsState tests

use network-specific help center link (#2285)

6b99740

style: enforce object-shorthand (#2286)

5831328

fix: make non-interactive header elements unselectable (#2288)

7b82913

fix: always paint StyledPollingNumber (#2254)

4bdf3c1

Adds a en-space to StyledPollingNumber so it is always painted. Fixes a layout shift when rendering the first block number. StyledPollingNumber is taller than its container, so waiting to paint it causes a layout shift when rendering.

chore: paint currency selector on initialization (#2245)

f59c5f6

Avoids a flash of "Select a token" as the App initializes.

feat: governor bravo support (#2271)

30cffb7

* first pass * Fix code style issues with ESLint * address comments Co-authored-by: Lint Action <[email protected]>

chore: use native flatMap (#2231)

416a3f9

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

353c475

alfetopito reviewed Dec 16, 2021

View reviewed changes

added react-cosmos implementation and some examples

202a45d

elena-zh mentioned this pull request Dec 20, 2021

App's logo is missing on the hard error page in the latest PRs #2020

Closed

nenadV91 added 6 commits December 20, 2021 15:33

removed jazzicon and updated IdenticonMod component

eb1e6e4

updated GoogleAnalyticsReporter and some small changes

07691e9

updated CurrencyLogoMod

04200fc

removed Auto Router setting and some small changes

7681a40

another batch of pr changes

5df1a77

added more small updates

089f84a

alfetopito reviewed Dec 21, 2021

View reviewed changes

W3stside reviewed Dec 21, 2021

View reviewed changes

src/components/AddressInputPanel/index.tsx Outdated Show resolved Hide resolved

W3stside reviewed Dec 21, 2021

View reviewed changes

src/components/Badge/index.tsx Outdated Show resolved Hide resolved

W3stside reviewed Dec 21, 2021

View reviewed changes

another batch of RP updates

28ff9e6

Merge branch 'develop' into uniswap-merge

69e8dcc

W3stside self-requested a review December 24, 2021 12:11

W3stside approved these changes Dec 24, 2021

View reviewed changes

nenadV91 added 2 commits December 24, 2021 15:05

fix for integration-tests

8c783b6

Merge branch 'develop' into uniswap-merge

3ac05d6

nenadV91 merged commit b85ca42 into develop Jan 3, 2022

elena-zh mentioned this pull request Jan 10, 2022

Tool tips network switcher #1771

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[:unicorn: Uniswap Merge] - imports delight #1982

[:unicorn: Uniswap Merge] - imports delight #1982

nenadV91 commented Dec 8, 2021 •

edited

Loading

alfetopito left a comment

alfetopito Dec 16, 2021

alfetopito Dec 16, 2021

alfetopito Dec 16, 2021

W3stside Dec 21, 2021

alfetopito Dec 16, 2021

alfetopito Dec 16, 2021

alfetopito Dec 16, 2021

alfetopito Dec 16, 2021

alfetopito left a comment

alfetopito Dec 16, 2021

alfetopito Dec 16, 2021

alfetopito Dec 16, 2021

alfetopito Dec 16, 2021

alfetopito Dec 16, 2021

alfetopito Dec 16, 2021

nenadV91 commented Dec 17, 2021

elena-zh commented Dec 20, 2021

elena-zh commented Dec 20, 2021

alfetopito commented Dec 21, 2021

nenadV91 commented Dec 21, 2021

alfetopito left a comment

alfetopito Dec 21, 2021

alfetopito Dec 21, 2021

alfetopito Dec 21, 2021

alfetopito Dec 21, 2021

alfetopito Dec 21, 2021

alfetopito Dec 21, 2021

W3stside Dec 21, 2021

W3stside Dec 21, 2021

W3stside commented Dec 21, 2021

elena-zh commented Dec 22, 2021

W3stside left a comment

		import { useAppDispatch } from 'state/hooks'

		import { getNetworkLibrary } from '../connectors'

		import { ExternalLink } from '../../theme'
		import { CloseIcon, CustomLightSpinner } from '../../theme/components'

		import { TYPE } from 'theme'
		import { TYPE } from '../../theme'

		import { Percent } from '@uniswap/sdk-core'
		import { L2_CHAIN_IDS } from '@src/constants/chains'

		import { IdenticonProps } from 'components/Identicon'

		import { useActiveWeb3React } from '../../hooks/web3'

[:unicorn: Uniswap Merge] - imports delight #1982

[:unicorn: Uniswap Merge] - imports delight #1982

Conversation

nenadV91 commented Dec 8, 2021 • edited Loading

Summary

Test

Tasks

Overview

alfetopito left a 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

Choose a reason for hiding this comment

alfetopito left a 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

nenadV91 commented Dec 17, 2021

elena-zh commented Dec 20, 2021

elena-zh commented Dec 20, 2021

alfetopito commented Dec 21, 2021

nenadV91 commented Dec 21, 2021

alfetopito left a 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

Choose a reason for hiding this comment

W3stside commented Dec 21, 2021

elena-zh commented Dec 22, 2021

W3stside left a comment

Choose a reason for hiding this comment

nenadV91 commented Dec 8, 2021 •

edited

Loading