Skip to content
This repository has been archived by the owner on Jun 24, 2022. It is now read-only.

[Uni merge 🦄 ] Switch network adaptation #1501

Merged
merged 21 commits into from
Oct 11, 2021

Conversation

W3stside
Copy link
Contributor

@W3stside W3stside commented Oct 1, 2021

WIP - adds network switching via uni merge

THIS WILL CHANGE WHEN WE RE-MERGE UNI V4.14+ (UNI is currently at v4.19.x)

@alfetopito
Copy link
Contributor

Github! Why you no deploy? o.O

@W3stside W3stside force-pushed the uni-4.13.0/switch-network-adaptation branch from b89b9fe to bf2480c Compare October 6, 2021 12:19
@github-actions
Copy link
Contributor

github-actions bot commented Oct 6, 2021

  • 🔭 GP Swap: Gnosis Protocol v2 Swap UI

@W3stside W3stside force-pushed the uni-4.13.0/switch-network-adaptation branch 2 times, most recently from 15e7f78 to 57bf25b Compare October 7, 2021 11:49
@W3stside W3stside requested review from a team October 7, 2021 11:50
@elena-zh
Copy link

elena-zh commented Oct 7, 2021

Hey @W3stside !
Great job!
But here is my long list of issues:

  1. Networks dropdown is displayed to a not connected user. I think, it would be goo to remove it
    hide to a not connected
  2. It would be great to differentiate network icons somehow. Especially needed for a mobile view, where it is difficult to understand to which network you are currently connected

differentiate icons somehow
can't understand

  1. Might be related to [Uni merge] Update XDAI to new multicall contract #1528, but balances in xDAI in the current PR are loaded forever

  2. Cross icon in the menu is hidden by scroll bar. To reproduce the issue open menu from the Swap page
    cross icon

  3. 'Twitter' menu action has a different color. No margin between CowGame label and icon
    image

  4. As an enhancement, I think it would be great to move 'Light/Dark' modes switching to the bottom of the list

  5. in iPhone and Android: menu bar is not scrollable, so it is impossible to find 'Terms and Conditions' page
    image

  6. About and Swap pages are missing in the header and in the menu on a certain screen resolutions
    about swap

  7. Sometimes it is no possible to switch a network in a connected wallet. So it would be nice, I think, to remove the message from the tooltip
    change networks

  8. It would be nice to remove a 'hovered' effect from the network indicator when we can't switch to it
    remove hover

  9. in iPhone Android devices: 'Connect' button is cropped
    image
    Also, menu seems to be shifted
    image

  10. When a wallet is connected to a not supported network, pressing on the any network indicator calls 'Please connect to the appropriate Ethereum network' modal appears, however, it would be good to force MM to switch networks instead. Or hide this dropdown, at least

  11. There is no notification in the injected browser when a wallet is connected to a not supported network
    image
    When I press on the network dropdown, I see the empty connection modal:
    image

  12. Tiny UI case: when cancel switching network in the injected MM browser, network dropdown remains to be opened. I think, it would be nice to close it
    please connect

  13. I wonder why we cannot switch networks in the connected MM wallet using WC?
    WC MM - do not allow

@W3stside
Copy link
Contributor Author

W3stside commented Oct 7, 2021

Hey @W3stside ! Great job! But here is my long list of issues:

  1. Networks dropdown is displayed to a not connected user. I think, it would be goo to remove it
    hide to a not connected

This is partly on purpose - it lets users see what it available and clicking on it prompts the connect wallet modal.

  1. It would be great to differentiate network icons somehow. Especially needed for a mobile view, where it is difficult to understand to which network you are currently connected

differentiate icons somehow can't understand

I think that is out of scope for this PR - Uniswap doesn't do it and this is part of the merge. Good to have a an issue tho i agree

  1. Might be related to [Uni merge] Update XDAI to new multicall contract #1528, but balances in xDAI in the current PR are loaded forever

yep not this pr

  1. Cross icon in the menu is hidden by scroll bar. To reproduce the issue open menu from the Swap page
    cross icon

hmm ok checking

  1. 'Twitter' menu action has a different color. No margin between CowGame label and icon
    image

ok checknig

  1. As an enhancement, I think it would be great to move 'Light/Dark' modes switching to the bottom of the list

ok i agree

  1. in iPhone and Android: menu bar is not scrollable, so it is impossible to find 'Terms and Conditions' page
    image

hmm ok will check this

  1. About and Swap pages are missing in the header and in the menu on a certain screen resolutions
    about swap

interesting, good find. will check

  1. Sometimes it is no possible to switch a network in a connected wallet. So it would be nice, I think, to remove the message from the tooltip
    change networks

fair enough

  1. It would be nice to remove a 'hovered' effect from the network indicator when we can't switch to it
    remove hover

ok

  1. in iPhone Android devices: 'Connect' button is cropped
    image

this is on purpose as it needs to save space. can be logged as an issue

Also, menu seems to be shifted
image
10. When a wallet is connected to a not supported network, pressing on the any network indicator calls 'Please connect to the appropriate Ethereum network' modal appears, however, it would be good to force MM to switch networks instead. Or hive this dropdown, at least
11. There is no notification in the injected browser when a wallet is connected to a not supported network
image
When I press on the network dropdown, I see the empty connection modal:
image
12. Tiny UI case: when cancel switching network in the injected MM browser, network dropdown remains to be opened. I think, it would be nice to close it
please connect

  1. I wonder why we cannot switch networks in the connected MM wallet using WC?

not supported

![WC MM - do not allow](https://user-images.githubusercontent.com/70885163/136399730-2b2c3a07-1182-4d05-b85f-cf9987775b00.jpg)

@W3stside W3stside force-pushed the uni-4.13.0/switch-network-adaptation branch from 57bf25b to 5d118ce Compare October 7, 2021 16:29
@W3stside W3stside changed the title [Uni 4.13.0] Switch network adaptation [Uni merge 🦄 ] Switch network adaptation Oct 7, 2021
- network card style
- text change
- move menu items into menu at medium
- deal better with unsupported networks
@W3stside
Copy link
Contributor Author

W3stside commented Oct 8, 2021

hi @elena-zh could you please re-check? thanks!

@elena-zh
Copy link

elena-zh commented Oct 8, 2021

Hi @W3stside , I'm still facing all issues I mentioned above.
Are there any issues with deployments?

@W3stside
Copy link
Contributor Author

W3stside commented Oct 8, 2021

Hi @W3stside , I'm still facing all issues I mentioned above. Are there any issues with deployments?

cmd + shift + r

@elena-zh
Copy link

elena-zh commented Oct 8, 2021

Btw, @W3stside , I have created separate issues for 2 and 11 cases, but I'm not sure whether I need to create separate issues for 12-14 cases, or they are fixed there.
Could you please clarify?

@W3stside
Copy link
Contributor Author

W3stside commented Oct 8, 2021

Btw, @W3stside , I have created separate issues for 2 and 11 cases, but I'm not sure whether I need to create separate issues for 12-14 cases, or they are fixed there. Could you please clarify?

2,11 i think should be logged as issues

@elena-zh
Copy link

elena-zh commented Oct 8, 2021

Great job! Just few remaining cases are still tot fixed:

  1. Cross icon in the menu bar is still overlapped by the scroll bar. Not a high priority, so let me know whether I need to create a separate issue for this case
    cross

  2. Twitter menu action is still has an orange color
    twitter

  3. No margin between CowGame label and icon (not a priority, I can create a separate issue for this)
    cowgame

  4. Still I can't scroll menu bar in mobile devices to see 'terms and conditions' action. See the video: the app is opened in the incognito mode, so there should not be cache issues
    https://user-images.githubusercontent.com/70885163/136547136-5fc0e4a6-6698-45ab-aa79-55b3eb269eb3.mp4

@elena-zh
Copy link

elena-zh commented Oct 8, 2021

One more question related to networks dropdow to a not connected user.
When I press on any network, I call the connection modal. And I expect to be connected to the selected network.
But as a result I appear to be connected to the network that is selected in my MM.
Can we force network changing in the MM to the required one after connection?
See the video for more details: https://watch.screencastify.com/v/Aamruv5B3nzgYpnD0jtt

@W3stside
Copy link
Contributor Author

W3stside commented Oct 8, 2021 via email

@elena-zh
Copy link

elena-zh commented Oct 11, 2021

@W3stside , the issue with network switching on connection works fine!

I have created a separate issue #1549 for padding between cowgame icon in label in the menu as it presents in Prod.
Also, I have created a separate issue #1551 for the overlapped cross icon by scroll bar in the menu.

What it left to fix is:

  • 'Twitter' menu icon is still in orange in the menu.
  • the menu is still not scrollable in mobile devices.

And a new tiny thing that footer elements are not clued to the bottom when screen width is less than 1020 px and more than 720 px.
image
But I can add this case to #1550 issue. However, this case is related exactly to this PR.

@W3stside
Copy link
Contributor Author

@elena-zh could you please create a separate issue for the scrolling menu block? And please approve this if this PR is ok (besides the noted issues) thanks!

Copy link
Contributor

@fairlighteth fairlighteth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving to keep this going asap. I see some stylistic smaller issues but can address this separately 👍🏼

@elena-zh
Copy link

Issue with menu scroll in mobile: #1556
Issue with Twitter action in the menu #1557

@W3stside W3stside merged commit 496d487 into uni-merge/4.13.0 Oct 11, 2021
@W3stside W3stside deleted the uni-4.13.0/switch-network-adaptation branch October 11, 2021 13:30
W3stside added a commit that referenced this pull request Oct 13, 2021
* ignore state/data/generated.ts

* fix: run graphql:codegen on yarn build (#1933)

* run graphql codegen on build

* yarn.lock

* remove ms.macro

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

* fix: error messages from walletconnect provider (#1943)

* fix(position page): link to the token page of the explorer instead of the address page from the position page

* feat: handle chain id in subgraph api (#1938)

* build dynamic subgraph url based on chain id

* reset api state (query cache) on chain id change

* removed dependency on rtk-query/graphql

* add error message

* feat: add fee tier distribution badge (#1862)

* integrate with The Graph and auto-select fee tier

* restored

* addressed some design feedback

* add pulsing animation on feeAmount change

* simplify fee tier title

* adjust button radios

* addressed some design feedback

* log ReactGA events

* ignore data while fetching

* update to use new generated queries

* remove deleted file

* add usefeetierdistribution hook

* invalidate cache and standardize the outlined card

* added react ga

* fix show options logic

* address design feedback

* show % select in minified view

* updated merge error

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

* feat(pools): fetch pool tick data from uniswap v3 subgraph (#1932)

* add hooks to fecth ticks data and active liquidity

* cleanup

* add polling interval

* moved ms.macro types to dev deps

* generate graphql schema on build

* added @types/ms.macro

* use clone deep

* refactor: logs hook (#1941)

* feat(logs): add an infrastructure for fetching logs in a declarative way

* use the logs hook in the vote page, first pass

* fix comment

* bit of cleanup

* unused imports

* improve loading indicator on vote page

* some testnet behavior improvements

* fix loader state

* loading state nit

* show correct indexes

* remove the unnecessary retry code

* first pass at the slice

* no throws

* loading indicator should go away if not connected

* use the logs slice for the logs hook state

* style changes per cal's request

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

* various edits

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

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

* fix: reduce call retries by specifying a block tag in multicall

* update defaults (#1955)

* fix: use a multicall that allows limiting gas of the individual calls (#1953)

* fix: use a multicall that allows limiting gas of the individual calls

* use the latest multicall addresses

* fix: use an arbitrum multicall that returns a better block number

* remove loading indicator from fee tier selection (#1954)

* fix: invalidate subgraph cache with provideTags (#1962)

* invalidate queries using tags

* enhance generated api with provide tags

* clean up

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

* fix: do not reverse the proposals list in place

* no more `borderRadius` errors! (#1968)

* fix(position image): increase the gas required constraint for the token URI

* remove a lot of dead code (#1970)

* refactor(devx): show a warning when a call fails due to insufficient gas allowed

* chore: update yarn.lock

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

* feat(L2): network alert cards (optimism and arbitrum) (#1957)

* design review for arbitrum UI

* add optimism L2 UI

* better gradients, remove v2 links/routes, some minor padding and margin fixes

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

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

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

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

* fix l2 routing bug

* fix last commit

* fix(L2): routing fixes (#1980)

* Revert "fix last commit"

This reverts commit 9f5764a.

* Revert "fix l2 routing bug"

This reverts commit f6dea47.

* drops routing changes for L2

* pool v2 switch networks message

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

* stabilize fee distribution in hook (#1979)

* fix: enforce styled-components/macro usage and upgrade react-scripts (#1981)

* upgrade react-scripts and enforce macro rule

* Fix code style issues with ESLint

Co-authored-by: Lint Action <lint-action@samuelmeuli.com>

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

* improve liquidity depth hooks and data fetching (#1989)

* feat(pools): add liquidity chart range input primitives (#1990)

* first iteration of liquidity chart primitives

* add tickprocessed type

* clean up

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

* chore: update the contribution guidelines (#1987)

* chore: update the contribution guidelines

* move

* note about non-deterministic steps

* little bit of separation

* language nits, add accessibility

* add reasoning

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

* Updating two public-facing URLs to docs (#1992)

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

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

* feat: Add Optimism (#1923)

* preliminary support

* fix multicall abi

add explorer support

* Fix code style issues with ESLint

* fix gas estimation

* fix todo tests

* fix gas estimation comments

* anonymize links to kovan etherscan and poll more frequently on optimistic kovan

* separate pool creation

* remove supported chain id

* remove the blocktag

* do not use the blocktag on optimism only

* give more gas to tokenURI for optimism

* update sdk

* temp fix to the block tag thing (do not update the block number from the fetch block number)

* remove unused import

* gasRequired -> multi-network

* bump quoter gas limit to 6m on optimism

* move the gas required parameter by chain id one level up

* missed a hook

* retry fetching receipts for optimism as many times as arbitrum

* fix duplicate enum, add optimism as well to retry options config

* fix: state not getting updated after a transaction confirmation

* bump sdk version

* update for mainnet optimism (#1998)

* fix for calculateGasMargin on optimism

Co-authored-by: Lint Action <lint-action@samuelmeuli.com>
Co-authored-by: Moody Salem <moody.salem@gmail.com>

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

* fix: simplify liqudity depth hooks and improve chart primitives (#1999)

* updated hooks and chart primitives

* add lodash.inrange to package.json

* feat(pool): add liquidity distribution range slider and update add liquidity layout (#1829)

* first iteration of useTicks and useActiveLiquidity

* feat(pools): add liquidity depth chart (#1835)

* cleanup

* use area chart instead of bar chart

* check for undefined rather than falsy

* feat: range buttons based on fee amount (#1870)

* range buttons based on fee amount

* hardcode percentages as ticks

* increase blocksperfect

* feat: optimize add liquidity charts (#1880)

* ignore syncing state

* remove surrounding ticks

* avoid processing price1 as it is unused

* cleanup

* feat: add zoom buttons to liquidity depth chart (#1882)

* ignore syncing state

* remove surrounding ticks

* avoid processing price1 as it is unused

* cleanup

* first pass at +/- zoom buttons

* remove console.log, cleanup

* use real price for price line

* updated brush handles to latest spec

* added % labels to handles

* round tick to nearest usable tick

* first pass at brushable area chart with d3

* first pass at brushable area chart with d3

* rework

* address PR comments

* add brush handles

* address PR comments

* further improvements

* feat(pools): improve full range support + capital efficiency warning (#1903)

* handle min and max prices in add liquidity

* cleaned up

* use flag to denote full range

* reset inputs on fee select

* fixed merge conflict

* handle full range in positions preview

* fixed invalid range when tokens are reversed

* use formatTickData

* updated layout

* cleaned up layout

* fixed address

* avoid re-rendering deposit amounts

* added zoom behavior and more styling

* renamed chart

* renamed main chart file;

* add brush tooltips

* remove chart title

* added accents to brush handles

* more work

* moved to file

* modularize chart components

* fix maximum depth

* added brush labels

* cleanup

* cleanup

* set up zoom

* added new components

* improved brush and zoom integration

* cleaned up clip path

* fixed clip paths

* integrated with the graph changes

* adjust fee selector

* fix data error

* add bar chart

* polish

* merged

* clean up error

* cleaned up after merge

* visual improvements

* moved +/- buttons to the right/left

* removed margin bottom

* removed unsused

* fix brush labels % change

* use d3.axisBottom

* updated labels

* improve brush range

* fix one brush change only

* adjust zoom and clippath

* use bars

* use area

* adjust axis bottom to mocks;

* improved bars

* show bar colors

* better handle full range

* adjust colors for light mode

* updated to mocks

* adjusted handles for visibility

* switch to area

* add react ga events

* adjusted to mocks

* memo brush domain to avoid re-renders

* fix inputstepcounter color

* adjust handles

* rely on the graph sorting tickidx

* use curvestepafter

* updated polish

* merged main

* add clamping and other fixes

* highlight selected area using a mask

* use price instead of % for labels

* delete unused

* refine ux

* relayout

* improve hooks

* adjust layout for mobile

* fixed card color

* adjust padding

* preent tick overflow

* flip handles sooner

* delete bars.tsx

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

* update multicall address

* fix: min/max price inverted in positions page (#2002)

* fix param ordering in inverter hook

* use object param

* fix: retry calls that return header not found errors (#2004)

* fix: make liquidity chart and input step counter responsive (#2005)

* make chart responsive

* make input step counter text responsive

* clean up chart

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

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

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

* chore(token lists): bump the token list spec version

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

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

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

* support optimism and arbitrum subgraphs (#2001)

* fix(L2): polish (#1988)

* polish

move getINfoLinkByChainId to chain constants

pr review - translations

optimism token list, typo, text color for L1 switch

use <Trans /> instead of t

undo unintentional tokenlist order change

use {'Optimism'} instead of {name}

switch deadline implementation

remove unused TYPE import

switch to generalized CHAIN_INFO instead of L2_INFO so we don't have to check in components

add target chain id param to optimism bridge

fix a minor breakpoint issue

reduce sigfigs for header balance

update network card dropdown text for optimism

remove list code

refactor SupportedChainId

* SupportedL1ChainId | SupportedL2ChainId -> SupportedChainId

* fix: price tokens on optimism mainnet using DAI

* fix: remove dollar sign from translation of eth amount

fixes Uniswap/interface#1986

* fix: add liquidity flow polish (#2017)

* addressed feedback

* set initial, min and max zoom levels

* better handle 0

* avoid formatting range selector

* polish `not created` state

* remove unused import

* fix: update CMC priority within lists (#2019)

* fix(routing): updates routing constants for layer 2 networks to use ETH (#2018)

* fix: properly set upper/lower base/quote on manual inversion (#2023)

* load pool data for each tier to determine state (#2026)

* compare with undefined rather than falsy (#2027)

* fix: add liquidity ux polish (#2024)

* zoom out on intiial

* adjust initial zoom ranges

* remove unneeded reactga event

* adjust full range warning copy

* update zoom

* adjust zoom ranges and label around current price

* fix(L2): use 10 bips slippage for swaps by default on L2 (#2035)

* use 10bip slippage on L2

* update deps

Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com>

* add optional chaining for stakingInfo (#1950)

* fix(L2): enable optimism token list when switched to optimism (#2036)

* add title text and opacity variability to token lists

* add optimism token list

* show tokens from active lists

* sort up token lists
with tokens on the current chain

* fix up some type issues

prune out chainId changes

* clean up leftover any

* refactor token count mechanism

* handle plurals in title text string

* new combineMaps implementation

* remove custom plural

* address a couple nits

* show the number of tokens on current chain

Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com>
Co-authored-by: Justin Domingue <judo@uniswap.org>

* fix overflow on mobile (#2037)

* fix(L2): add downtime warning to add liquidity and adjust styles of network notification (#2034)

* add liquidity warning and network notification

* remove unneeded width

* use externalLink in LinkOutToBridge component

Co-authored-by: Moody Salem <moody.salem@gmail.com>

* fix: dismiss txn confirmation modal if on L2 (#2022)

* dismiss txn confirmation modal if on l2

* line up far right margin;

* remove submitted view on txns if on L2

* remove uneeded chainid

* wrap dismissal in useEffect

* update variable names

* fix(L2): Design tweaks for L2 (Optimism) (#2038)

Style tweaks to header layout, network dropdown and pool pages

Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com>

* fix: support for isolated pool creation  (#2029)

* revert to remove ui polish changes

* left align blurb and fix bp issue

* fix translation wrapper

* remove preview screen for create, hide submitted txn UI for create, copy updates

* small fixes

* copy updates for create blurb

* add set price range title

* add translation

* fix some translations

Co-authored-by: Justin Domingue <judo@uniswap.org>

* update links (#2040)

* chore: support stubbing subgraph in integration tests (#2039)

* upgrade to 7.0

* first iteration of stubbing subgraph in integration tests

* fix: remove x-axis clamping behavior in liquidity chart (#2042)

* remove x-axis clamping behavior

* remove extra curly braces around errorMessage

* fix: revert remove x-axis clamping behavior in liquidity chart (#2045)

* Revert "fix: remove x-axis clamping behavior in liquidity chart (#2042)"

This reverts commit f86db00.

* removed extra curly braces around errorMessage

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

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

* fix(arbitrum): use infura endpoints

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

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

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

* refactor: clean up some constants

* fix: add DAI and WBTC and USDT to routing for Optimism

fixes Uniswap/interface#2016

* fix(block number): link to the correct page in etherscan for optimism block number links

* fix: update balance check in derived swap state (#2054)

* update balance check in derived swap state

* replace balance check with correct version of trade

* remove duplicate `set price range` title when there is liquidity (#2058)

* fix: add language selector in top-level menu (#2057)

* initial language selector

* set > icon opacity for consistency

* always reset menu to main on close

* always reset menu on menu open

* fix: all supported chain ids should not include the string keys of the enum

* chore: add one more unit test for ALL_SUPPORTED_CHAIN_IDS

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

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

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

* fix: remove chart clamping and show indicator when handle is off screen (#2064)

* initial off screen indicator

* adjust offscreen indicator

* add off screen handle indicator

* hide reset until we get a better behavior

* add svg.tsx

* fix: change panning cursor to col-resize (#2071)

* change panning cursor to col-resize

* revert to grabby, and support grabbing

* fix: set language using url param in language dropdown (#2063)

* set language using url param in language dropdown

* refactor common code into a hook

* add hook

* address pr feedback

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

* feat: only block on app url, mobile UI tweaks (#2073)

* start iframe ui updates

* replace hook with constant

* add origin check for blocked lists

* remove origin check for local unsupported list

* remove redundant retun

* remove iframe check

* undo local change

* remove unused dependencies (#2074)

* increase zoom out range (#2076)

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

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

* fix: invert selected range on RateToggle instead of clearing inputs (#2078)

* Update WalletLink and @web3-react/walletlink-connector (#2079)

* fix(swap): double max gas for quoting a v3 swap for large trades

* set 5 min deadline on swaps and hide UI on L2 (#2081)

* chore: add blurb about release process (#2061)

* chore: add blurb about release process

* additional standard

* how to collect feedback

* feat: routing api integration (#2080)

* initial routing api integration

* add routing api slice

* display route in dialog

* addressed pr feedback

* switch to `get`

* renamed useRouterTradeExactIn to useRouter

* moving few files to later iteration

* removed unnecessary `as`

* switch to polling

* add todo for blocknumber freshness

* remove account-slippage-deadline

* chore: copy edit on CONTRIBUTING.md

* perf: list to token map function was doing too many reduces (#2095)

* perf: remove extra spread operators from the combine maps function

* feat: support connecting to a gnosis safe (#2096)

* feat: support connecting to a gnosis safe

* add the manifest.json attributes required by gnosis safe

* remove background fill

* copy

* only try injected provider if not active after trying safe

* add UniH to unsupported list (#2097)

* fix: better support decimal overflow (#2075)

* better support decimal overflow

* improve tests

* explicitly define num digits in toSignificant

* add tests for 0 decimals

* undo change to tryParseAmount and instead compute price without relying on parse

* remove console log and add test

* removed comment

* addressed pr feedback

* improve parsing logic

* addressed pr feedback

* update unsupported and broken lists (#2100)

* fix: remove html ids and unnecessary keys from the menu

* fix: prevent error if user selects ETH and WETH in add liquidity (#2112)

* fix: prevent error if user selects ETH and WETH in add liquidity

fixes Uniswap/interface#1763

* linting error

* revert changes to Tokens.ts

* test: set up component snapshot testing (#2102)

* set up snapshot testing

* improvements

* add tests for TextInput as an example

* Fix code style issues with ESLint

* add comment to custom-test-env file

* only set up needed providers

* include style rules in snapshots

* disable redux storage warning

* added setupTests to avoid boilerplate

Co-authored-by: Lint Action <lint-action@samuelmeuli.com>

* Revert "feat(routing): support mirror protocol routing as additional bases (#1375)"

This reverts commit 3198129.

* Revert "feat(uma): uma call option routing (#1385)"

This reverts commit 89d484d.

* feat: use modal for txn confirmation on l2 (#2055)

* use modal for txn confirmation on l2

* update with error state

* remove 1 translation

* dedicated L2 component

* update styling on to be less jumpy

* add success animation to modal

* revert regular submitted content

* remove useless hook in popups

* remove import

Co-authored-by: Ian Lapham <ian_lapham@alumni.brown.edu>

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

* fix: toggle liquidity position when toggling rates (#2117)

If field A and field B are already populated, chances are the user wants
them to remain the same and only wants to invert the price range
selector.

The conversion isn't exact, but should be preferable to the previous
behavior.

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

* fix: upgrade walletconnect to 1.5.1 (#2120)

* upgrade walletconnect to 1.5.0

* bump again

* document `useQueryCacheInvalidator`

explains why `chainId` is pulled directly from the store.

* Fix code style issues with ESLint

* fix(L2): update downtime warning copy (#2114)

* add link (#2113)

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

* fix: add support for full range positions in add liquidity (#2090)

* remove arbitrary range buttons and move full range button

* better align full range to deposit

* support dragging range when in full range

* hack to support full range brushing

* restore zoom levels

* adjusted for mocks

* fix styling

* simplify type

* restore rate toggle change

* fix lower bound by looking at isSorted

* better align bottoms

* add reset button for full range positions

* only flip when not at limit

* fix +/- buttons in range selector

* add help link

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

* fix: upgrade ethers to allow constructing transaction data compatible with eip-1559 (#2121)

* fix: upgrade ethers to allow constructing transaction data compatible with eip-1559

* bump the experimental provider

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

* fix: update mobile header to fix overflow (#2125)

Co-authored-by: Matthew Quinn <matthew.quinn@libertymutual.com>

* fix: center import pool text V2  (#2122)

* fix: center import pool text V2

* fix: updated based on feedback

Co-authored-by: Matthew Quinn <matthew.quinn@libertymutual.com>

* update full range documentation link

* Fix code style issues with ESLint

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

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

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

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

* fix: optimism link and some copy changes (#2126)

* fix: optimism link

* fix: (un)planned downtime copy changes

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

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

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

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

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

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

* chore(deps): bump tar from 6.1.0 to 6.1.4 (#2132)

Bumps [tar](https://github.com/npm/node-tar) from 6.1.0 to 6.1.4.
- [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.0...v6.1.4)

---
updated-dependencies:
- dependency-name: tar
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* upgrade to walletconnect 1.5.2 (#2134)

* fix: rename weth9 to weth (#2133)

* update @uniswap/sdk-core and @uniswap/v3-sdk

* reorder

* update unsupported list (#2143)

Co-authored-by: Ian Lapham <ianlapham@Ians-MacBook-Pro.local>

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

* fix: avoid running BestV3Trade when tokens are the same (#2172)

* avoid running BestV3Trade when tokens are the same

* flipped condition

* add ReactGA event for full range (#2181)

* update chinese simplified and traditional display names (#2180)

* fix: proposal descriptions should be pulled from the right governor (#2176)

* fix: `#isTradeBetter` should check that output currencies are equal (#2177)

* fix: isTradeBetter should check that input/output are equal

* fix the fix

* update blocked address list (#2182)

Co-authored-by: Ian Lapham <ianlapham@Ians-MacBook-Pro.local>

* fix: do not construct routes with the same pool twice (#2196)

* chore: set `default_bump` to false per mathieudutour/github-tag-action#85

* fix: use `@walletconnect/ethereum-provider` instead of `@walletconnect/web3-provider` (#2175)

* use @walletconnect/ethereum-provider

* bump to support client-side disconnect

* chore(i18n): touch en-US to prevent lingui from adding a creation date (#2210)

Fixes #2198. Touching en-US.po before extracting messages prevents lingui from adding a creation date, maintaining deterministic builds and IPFS hashes.

* chore(i18n): do not compile i18n messages (#2211)

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

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

* chore: fix SEO and accessibility nits for Lighthouse (#2212)

* refactor: index.html

* chore: preconnect to GA

* chore(SEO): add meta content

* chore(SEO): add alt to ethereum logo

* chore(accessibility): add aria-labels to menus

* chore(accessibility): mark AppBody as main

* chore(accessibility): update nav link ids

* chore(accessibility): set html.lang to match i18n locale

* chore(refactor): mv html.lang to useEffect

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

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

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

* fix: update walletconnect for deep links and scalability (#2215)

* chore: change language icon to globe (#2222)

* chore: change language icon to globe

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

* fix(governance): hot fix for `parseLog` crash

* fix: proposal formatting

* chore: rm unused styled-system (#2234)

* chore: update multicodec usage (#2233)

* chore: remove unused cross-env (#2232)

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

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

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

* fix: remove the walletconnect bridge url

* fix: use the latest ethereum provider which fixes the optimism rainbow issue

* fix: turn service workers back on (#1944)

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 <zzmp@uniswap.org>
Co-authored-by: Lint Action <lint-action@samuelmeuli.com>

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

* 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)

* fix(governance): special case bravo parsing (#2247)

* 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

* add arbitrum token list (#2268)

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

This reverts commit 00403a4.

* fix: disable serviceworker in integration tests (#2274)

* update explorer links for arbitrum (#2279)

* chore(deps): bump tar from 6.1.4 to 6.1.11 (#2280)

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] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* update optimism subgraph url (#2282)

* fix: older browser suppport (#2228)

* fix: Object.fromEntries polyfill

* fix: update polyfills

* fix: update polyfills

* chore: upgrade type system (#2276)

* chore: upgrade type system

Upgrade types, typescript, and formatters.

* fix: ListsState tests

* use network-specific help center link (#2285)

* style: enforce object-shorthand (#2286)

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

* fix: always paint StyledPollingNumber (#2254)

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)

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

* feat: governor bravo support (#2271)

* first pass

* Fix code style issues with ESLint

* address comments

Co-authored-by: Lint Action <lint-action@samuelmeuli.com>

* chore: use native flatMap (#2231)

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

* Squashed commit of the following:

commit 5f1d1af62bcd47286aafacc18788f4e7e22dd7c0
Author: Aseem Sood <asood123@yahoo.com>
Date:   Fri Sep 3 12:12:39 2021 -0400

    update readme

    tweak

commit 80a5b95c0e0ae8934b5591c982077eaa813db747
Author: Noah Zinsmeister <noahwz@gmail.com>
Date:   Fri Sep 3 11:52:56 2021 -0400

    consolidate and standardize unsupported tokens

* yarn lock

* merge type/style/conflict fixes

* fix supported networks support

* fix settings

* test snapshots

* don't ignore generated

* move workflows to uni

* path fix

* path fix / walletmodal

* Fix code style issues with Prettier

* small fixes post merge

* Fix code style issues with Prettier

* pr comments

1. imports/exports

* import path

* pr comments

* pr comments

* cypress fix

* remove projectId

* fix overflow in managelist

* style fix

* style fixes

* ci fix

* remove CI: false from workflow

* add new multicall xdai address (#1528)

* set xdai polling to 1ms (#1529)

* [Uni merge 🦄 ] replace uniswap text with cowswap (#1526)

* replace uniswap text with cowswap

* only show unsupported token tag

* comment unused types/imports

* [Uni merge 🦄 ] Switch network adaptation (#1501)

* fix supported networks

* lock file

* style fixes

* edit menu/header to better responsive feel

* dead code in baseTheme

* expand mediaWidths in cowswapTheme

* remove styled base theme

* responsive header for network switcher

* Fix code style issues with Prettier

* fix network connect on no connection

* network switching UI/logic fix

* pr comment fix chainId

* fix disabled check

* styling

* style pt.2 - highlight in list selected network

* yarn update

* pr comments:

- network card style

* pr comments:

- text change

* pr comments

- move menu items into menu at medium

* pr comments

- deal better with unsupported networks

* non-connected - connect and switch

Co-authored-by: Lint Action <lint-action@samuelmeuli.com>

* WIP Uni Merge - styles fixes. (#1565)

* Menu styles/icon fixes.

* Fix code style issues with Prettier

* Menu styles/icon fixes.

* Fix code style issues with Prettier

* Menu style fixes.

* iOS menu fix.

Co-authored-by: Lint Action <lint-action@samuelmeuli.com>

Co-authored-by: Justin Domingue <judo@uniswap.org>
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Moody Salem <moodysalem@users.noreply.github.com>
Co-authored-by: Moody Salem <moody.salem@gmail.com>
Co-authored-by: Ian Lapham <ian@uniswap.org>
Co-authored-by: Noah Zinsmeister <noahwz@gmail.com>
Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com>
Co-authored-by: Lint Action <lint-action@samuelmeuli.com>
Co-authored-by: ChrisFox.eth <39571193+foxaweber@users.noreply.github.com>
Co-authored-by: Luke Donato <lukedonato@gmail.com>
Co-authored-by: Callil Capuozzo <callil@uniswap.org>
Co-authored-by: Brendan Weinstein <65564422+brendanww@users.noreply.github.com>
Co-authored-by: Ian Lapham <ian_lapham@alumni.brown.edu>
Co-authored-by: Jeffrey Lin <jeffrey@icurse.nl>
Co-authored-by: Matthew Quinn <msquinn1@yahoo.com>
Co-authored-by: Matthew Quinn <matthew.quinn@libertymutual.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ian Lapham <ianlapham@Ians-MacBook-Pro.local>
Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>
Co-authored-by: circlehotarux <mightyherox@gmail.com>
Co-authored-by: Michel <31534717+biocom@users.noreply.github.com>
nenadV91 pushed a commit that referenced this pull request Nov 15, 2021
* fix for error token map parsings

* fix error on formatting sig figs

* fix various bugs

* no hover cursor

Co-authored-by: Noah Zinsmeister <noahwz@gmail.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants