This repository has been archived by the owner on Jun 24, 2022. It is now read-only.
Merge develop to claim #2124
Merged
Merge develop to claim #2124
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* fix(nav): render Vote link while awaiting connection Minimizes layout shift in the normal case. * perf: inline logo svg * perf: display connect button for web3 initial state
* merge tradeExactIn|Out * cleanup * reset polling interval * polish * improved types and fixed client side * rename combined to bestv3
* fix an issue with optimism/arbitrum alert distinction, add a prompt to switch to Optimism on mainnet * only prompt to switch networks if the user has a wallet connected * add readmore link styles * add network to the user's wallet if it hasn't been added already * network selector * hide arbitrum until it launches * add arbitrum for testing * update copy and some margins * fix alert opacity issue * remove the launch alert :( * adjust icon position and add curvier corners * lighten some colors * keep the selector around even if the user's wallet doesn't support the eip when they're on L2, just hide all other networks * copy updates and some other small tweaks * better mobile experience * shrink on mobile * fix some links and css * differentiate between selector and row logos * fix some copy * remove network alert from add liquidity pages, update copy and buttons on swap page, remove close option if no eth, persist close state otherwise * design polish * update read more links * update downtime warning to be less intense * oe logo ' * design polish sesh * fix a couple bugs
Bumps [tmpl](https://github.com/daaku/nodejs-tmpl) from 1.0.4 to 1.0.5. - [Release notes](https://github.com/daaku/nodejs-tmpl/releases) - [Commits](https://github.com/daaku/nodejs-tmpl/commits/v1.0.5) --- updated-dependencies: - dependency-name: tmpl dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* fix(i18n): do not defer render on locale Do not defer render on locale load. This delays the initial render of the page, effectively delaying to LCP. Lingui allows the page to render with no text while a locale is loading. A fallback locale is only used when loading a locale fails - not while it is pending. * perf(i18n): include default language in initial bundle
* initial support for Swahili (Tanzania) * remove sw-KE
* make useAllCurrencyCombinations return uniques * consolidate useBestV3Trade* functions * consolidate useBestV2Trade * typo * reverted changes to trade hooks * reverted changes to trade hooks Co-authored-by: Noah Zinsmeister <[email protected]>
* perf(font): load Inter var from HTML, not JS * perf(font): use font-display block Prevents FOUT. * perf(font): preload font Further removes font from the critical render path.
…2380) * refactor: transaction info is translated in the appropriate places fixes Uniswap/interface#1756 * getting closer * more work * finished, finally * bit more refactoring * move summary into its own file * little more cleanup in the transaction summary file * fix bad copy * fix the migrate notification * missing translation * fix the language for vote and address other pr comments * fix typo * - remove old transactions with this update - change to present tense - show ens name where appropriate * add a test that shows we don't clear old ones
* refactor: add an import sorting plugin * Fix code style issues with ESLint Co-authored-by: Lint Action <[email protected]>
Saves 20kb of gzipped payload.
* refine comparison method * adjust comment
Bumps [@uniswap/token-lists](https://github.com/Uniswap/token-lists) from 1.0.0-beta.25 to 1.0.0-beta.26. - [Release notes](https://github.com/Uniswap/token-lists/releases) - [Commits](Uniswap/token-lists@v1.0.0-beta.25...v1.0.0-beta.26) --- updated-dependencies: - dependency-name: "@uniswap/token-lists" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* fix(swap): use undefined as initial currencyId state Null should be used for a selection state, not an unknown state. undefined may signify that a currency was passed in the URL but not yet parsed. * perf(swap): initialize swap with url Initializes SwapState with URL parameters so that currency input may be rendered on the first frame. * test(swap): update hooks tests * test: fix casing * fix: check nullish to allow eg 0
[1.8.1] Update BARN urls
Hotfix 1.8.1 - Winter is gone (kind of)
# Summary Fixes #2065   # To Test 1. Open the [Cowswap dApp](https://pr2073--gpswapui.review.gnosisdev.com/). And check the <img src="https://user-images.githubusercontent.com/622217/148829833-377e642a-cc83-4dbb-81e0-4f1ad6e9965e.png" height="25" /> Gnosis Chain logo in the network selector.
[Release 🦄 ] v1.9.0
anxolin
force-pushed
the
merge-develop-to-claim
branch
from
f544ec9 to
5d7aa61
Compare
|
nenadV91
approved these changes
Jan 12, 2022
|
Are you able to tell which conflicts you resolved? |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
❗️IMPORTANT❗️ Do not squash!!!!!!!!! only do a regular good old merge.
Summary
This PR brings all the changes from develop to the
claimbranch.This is mainly bring the merge of uni and latest things from develop (so claim branch is not too outdated)