From 59db4c5b022b299a8d7e12d0f76767f062bf67be Mon Sep 17 00:00:00 2001 From: Nate Wienert Date: Thu, 24 Aug 2023 17:14:24 -1000 Subject: [PATCH] feat: Spore colors refresh (#7118) * Add colors and type and fix everywhere * fix text.tsx * Color and text adjustments * Further tweaks * Removed promotional gradient Changed to pink * Add new icons and tweak broken colors * Kill shadows Removes shadows from NFT cards, Pools and Tokens tables * Update icons Update filled and info icons to filled versions * Update bag icon Changed to fill style * Change share icon Changed to the new filled arrow * Fix merge errors * update tests * Complete find and replace old colors * Fix colors on pool pages * Update index.test.tsx.snap * fix header hover states * update test * Update connect button hover state * Update styles design bash * Update tests * Update fonts * fix buy button font weight * update tests * fix jumping input boxes * lint * lints * update tests * redo auth header * fix issues * fix snapshots * use individual weights instead of variable for nicer $ signn * update tests * make dark mode glow distinct * remove commented out code * icons in react * update textSecondary * fix feedback * port over token test fix * lint * fix: make popups appear above drawer and near top conditionally only when drawer is open * Revert "fix: make popups appear above drawer and near top conditionally only when drawer is open" This reverts commit 994697144374ae3fc0cdf9275bce538fda5fc8de. --------- Co-authored-by: Callil Capuozzo Co-authored-by: pp-hh-ii-ll <111304124+pp-hh-ii-ll@users.noreply.github.com> Co-authored-by: Callil Capuozzo --- cypress.config.ts | 2 +- cypress/e2e/token-details.test.ts | 2 +- cypress/e2e/wallet-dropdown.test.ts | 4 +- functions/__snapshots__/default.test.ts.snap | 439 ++ .../nfts/asset/__snapshots__/nft.test.ts.snap | 108 +- .../__snapshots__/collection.test.ts.snap | 108 +- .../tokens/__snapshots__/token.test.ts.snap | 144 +- public/fonts/Basel-Book.woff | Bin 0 -> 47616 bytes public/fonts/Basel-Medium.woff | Bin 0 -> 47144 bytes public/fonts/Inter-roman.var.woff2 | Bin 227688 -> 0 bytes public/index.html | 36 +- .../nft/svgs/marketplaces/looksrare-grey.svg | 2 +- public/nft/svgs/marketplaces/opensea-grey.svg | 2 +- public/nft/svgs/marketplaces/x2y2-grey.svg | 6 +- src/assets/images/buy.svg | 3 + src/assets/images/gas-icon.svg | 6 - src/assets/svg/eye.svg | 7 +- src/assets/svg/filter.svg | 3 + src/assets/svg/gas-icon.svg | 3 + src/assets/svg/search.svg | 4 +- src/assets/svg/settings.svg | 5 - src/assets/svg/share.svg | 3 - src/assets/wallets/browser-wallet-light.svg | 2 +- src/components/About/AboutFooter.tsx | 8 +- src/components/About/Card.tsx | 23 +- src/components/About/ProtocolBanner.tsx | 4 +- src/components/About/constants.tsx | 4 +- .../AccountDrawer/AuthenticatedHeader.tsx | 30 +- .../AccountDrawer/DownloadButton.tsx | 6 +- .../AccountDrawer/GitVersionRow.tsx | 2 +- src/components/AccountDrawer/IconButton.tsx | 26 +- src/components/AccountDrawer/LanguageMenu.tsx | 4 +- .../MiniPortfolio/Activity/ActivityRow.tsx | 8 +- .../Activity/OffchainActivityModal.tsx | 12 +- .../MiniPortfolio/Activity/index.tsx | 2 +- .../MiniPortfolio/ExpandoRow.tsx | 8 +- .../MiniPortfolio/NFTs/NFTItem.tsx | 4 +- .../MiniPortfolio/Pools/index.tsx | 15 +- .../MiniPortfolio/PortfolioLogo.tsx | 6 +- .../__snapshots__/PortfolioLogo.test.tsx.snap | 2 +- .../AccountDrawer/MiniPortfolio/index.tsx | 8 +- src/components/AccountDrawer/SettingsMenu.tsx | 4 +- .../AccountDrawer/SettingsToggle.tsx | 7 +- src/components/AccountDrawer/SlideOutMenu.tsx | 2 +- .../AccountDrawer/UniwalletModal.tsx | 10 +- src/components/AccountDrawer/index.tsx | 12 +- src/components/AddressInputPanel/index.tsx | 18 +- src/components/AirdropModal/index.tsx | 16 +- src/components/Badge/RangeBadge.tsx | 10 +- src/components/Badge/index.tsx | 30 +- .../Banner/BaseAnnouncementBanner/styled.tsx | 6 +- src/components/Button/index.tsx | 151 +- src/components/Card/index.tsx | 20 +- src/components/Charts/AnimatedInLineChart.tsx | 2 +- src/components/Charts/FadeInLineChart.tsx | 2 +- src/components/Charts/LineChart.tsx | 2 +- src/components/Charts/SparklineChart.tsx | 2 +- src/components/Common/index.tsx | 4 +- .../ConnectedAccountBlocked/index.tsx | 2 +- .../CurrencyInputPanel/FiatValue.tsx | 8 +- .../SwapCurrencyInputPanel.tsx | 46 +- src/components/CurrencyInputPanel/index.tsx | 36 +- src/components/ErrorBoundary/index.tsx | 18 +- src/components/Expand/index.tsx | 2 +- .../FeatureFlagModal/FeatureFlagModal.tsx | 40 +- src/components/FeeSelector/FeeOption.tsx | 2 +- src/components/FeeSelector/index.tsx | 6 +- src/components/FiatOnrampModal/index.tsx | 8 +- src/components/Icons/AlertTriangleFilled.tsx | 8 +- src/components/Icons/ArrowChangeDown.tsx | 10 + src/components/Icons/ArrowChangeUp.tsx | 10 + src/components/Icons/Gas.tsx | 12 + src/components/Icons/Info.tsx | 10 + src/components/Icons/LoadingSpinner.tsx | 14 +- src/components/Icons/Power.tsx | 10 + src/components/Icons/Search.tsx | 10 + src/components/Icons/Settings.tsx | 10 + src/components/Icons/Share.tsx | 10 + src/components/Icons/shared.tsx | 2 +- src/components/Identicon/StatusIcon.tsx | 6 +- .../__snapshots__/StatusIcon.test.tsx.snap | 4 +- src/components/Identicon/index.tsx | 2 +- .../InputStepCounter/InputStepCounter.tsx | 12 +- .../LiquidityChartRangeInput/Area.tsx | 4 +- .../LiquidityChartRangeInput/AxisBottom.tsx | 2 +- .../LiquidityChartRangeInput/Brush.tsx | 4 +- .../LiquidityChartRangeInput/Line.tsx | 2 +- .../LiquidityChartRangeInput/Zoom.tsx | 4 +- .../LiquidityChartRangeInput/index.tsx | 14 +- src/components/Loader/styled.tsx | 6 +- src/components/Logo/AssetLogo.tsx | 8 +- src/components/Logo/UniswapXBrandMark.tsx | 2 +- src/components/Menu/index.tsx | 14 +- src/components/Modal/index.tsx | 8 +- src/components/ModalViews/index.tsx | 2 +- src/components/NavBar/Bag.tsx | 4 +- src/components/NavBar/ChainSelector.css.ts | 10 +- src/components/NavBar/ChainSelector.tsx | 6 +- src/components/NavBar/ChainSelectorRow.tsx | 9 +- src/components/NavBar/MenuDropdown.css.ts | 6 +- src/components/NavBar/MenuDropdown.tsx | 31 +- src/components/NavBar/NavDropdown.css.ts | 4 +- src/components/NavBar/NavIcon.css.ts | 3 +- src/components/NavBar/NavIcon.tsx | 4 +- src/components/NavBar/SearchBar.css.ts | 24 +- src/components/NavBar/SearchBar.tsx | 18 +- src/components/NavBar/SearchBarDropdown.tsx | 18 +- src/components/NavBar/SuggestionRow.tsx | 14 +- .../__snapshots__/SearchBar.test.tsx.snap | 62 +- .../SearchBarDropdown.test.tsx.snap | 156 +- src/components/NavBar/index.tsx | 2 +- src/components/NavBar/style.css.ts | 14 +- src/components/NavigationTabs/index.tsx | 4 +- src/components/NetworkAlert/NetworkAlert.tsx | 2 +- src/components/NumericalInput/index.tsx | 6 +- .../Polling/ChainConnectivityWarning.tsx | 14 +- src/components/Polling/index.tsx | 8 +- src/components/Popover/index.tsx | 6 +- src/components/Popups/ClaimPopup.tsx | 4 +- src/components/Popups/PopupContent.tsx | 14 +- src/components/PositionCard/Sushi.tsx | 4 +- src/components/PositionCard/V2.tsx | 24 +- src/components/PositionCard/index.tsx | 42 +- src/components/PositionList/index.tsx | 12 +- src/components/PositionListItem/index.tsx | 21 +- src/components/PositionPreview/index.tsx | 4 +- src/components/PrivacyPolicy/index.tsx | 12 +- src/components/QuestionHelper/index.tsx | 2 +- .../RangeSelector/PresetsButtons.tsx | 2 +- .../RoutingDiagram/RoutingDiagram.tsx | 23 +- .../RoutingDiagram.test.tsx.snap | 84 +- src/components/SearchModal/CommonBases.tsx | 15 +- .../SearchModal/CurrencyList/index.css.ts | 4 +- .../SearchModal/CurrencyList/index.tsx | 19 +- src/components/SearchModal/CurrencySearch.tsx | 6 +- src/components/SearchModal/styled.tsx | 17 +- src/components/Settings/Input/index.tsx | 14 +- .../Settings/MaxSlippageSettings/index.tsx | 8 +- .../Settings/MenuButton/index.test.tsx | 4 +- src/components/Settings/MenuButton/index.tsx | 12 +- .../RouterPreferenceSettings/index.tsx | 8 +- src/components/Settings/index.tsx | 10 +- src/components/Slider/index.tsx | 18 +- .../__snapshots__/index.test.tsx.snap | 30 +- src/components/TextInput/index.tsx | 18 +- src/components/Toggle/MultiToggle.tsx | 12 +- src/components/Toggle/index.tsx | 10 +- .../TokenSafety/TokenSafetyIcon.tsx | 4 +- .../TokenSafety/TokenSafetyLabel.tsx | 2 +- .../TokenSafety/TokenSafetyMessage.tsx | 12 +- src/components/TokenSafety/index.tsx | 20 +- src/components/Tokens/TokenDetails/About.tsx | 10 +- .../Tokens/TokenDetails/AddressSection.tsx | 4 +- .../Tokens/TokenDetails/BalanceSummary.tsx | 9 +- .../Tokens/TokenDetails/BreadcrumbNavLink.tsx | 4 +- .../TokenDetails/InvalidTokenDetails.tsx | 8 +- .../MobileBalanceSummaryFooter.tsx | 16 +- .../Tokens/TokenDetails/PriceChart.tsx | 67 +- .../Tokens/TokenDetails/Resource.tsx | 6 +- .../Tokens/TokenDetails/ShareButton.tsx | 17 +- .../Tokens/TokenDetails/Skeleton.tsx | 4 +- .../Tokens/TokenDetails/StatsSection.tsx | 6 +- .../Tokens/TokenDetails/TimeSelector.tsx | 6 +- .../__snapshots__/PriceChart.test.tsx.snap | 42 +- src/components/Tokens/TokenDetails/index.tsx | 4 +- .../Tokens/TokenTable/FilterOption.tsx | 16 +- .../Tokens/TokenTable/NetworkFilter.tsx | 20 +- .../Tokens/TokenTable/SearchBar.tsx | 18 +- .../Tokens/TokenTable/TimeSelector.tsx | 14 +- src/components/Tokens/TokenTable/TokenRow.tsx | 29 +- .../Tokens/TokenTable/TokenTable.tsx | 11 +- .../__snapshots__/TokenRow.test.tsx.snap | 48 +- src/components/Tokens/loading.tsx | 6 +- src/components/Tooltip/index.tsx | 8 +- .../AnimatedConfirmation.tsx | 4 +- .../TransactionConfirmationModal/index.tsx | 28 +- src/components/V2Unsupported/index.tsx | 4 +- .../WalletModal/ConnectionErrorView.tsx | 2 +- src/components/WalletModal/Option.tsx | 12 +- .../WalletModal/PrivacyPolicyNotice.tsx | 10 +- .../__snapshots__/Option.test.tsx.snap | 6 +- src/components/WalletModal/index.tsx | 4 +- src/components/Web3Status/index.tsx | 31 +- .../addLiquidity/OwnershipWarning.tsx | 8 +- src/components/claim/AddressClaimModal.tsx | 14 +- src/components/swap/AdvancedSwapDetails.tsx | 10 +- src/components/swap/GasBreakdownTooltip.tsx | 14 +- src/components/swap/GasEstimateTooltip.tsx | 12 +- .../PendingModalContent/ErrorModalContent.tsx | 4 +- .../swap/PendingModalContent/Logos.tsx | 10 +- .../swap/PendingModalContent/TradeSummary.tsx | 6 +- .../swap/PendingModalContent/index.tsx | 10 +- src/components/swap/PriceImpactModal.tsx | 6 +- src/components/swap/PriceImpactWarning.tsx | 6 +- src/components/swap/SwapBuyFiatButton.tsx | 3 +- src/components/swap/SwapDetailsDropdown.tsx | 17 +- src/components/swap/SwapHeader.tsx | 2 +- src/components/swap/SwapModalFooter.tsx | 4 +- src/components/swap/SwapModalHeader.tsx | 8 +- src/components/swap/SwapModalHeaderAmount.tsx | 6 +- src/components/swap/SwapRoute.tsx | 4 +- src/components/swap/SwapSkeleton.tsx | 12 +- src/components/swap/TradePrice.tsx | 2 +- .../swap/UnsupportedCurrencyFooter.tsx | 8 +- .../AdvancedSwapDetails.test.tsx.snap | 26 +- .../SwapBuyFiatButton.test.tsx.snap | 10 +- .../SwapDetailsDropdown.test.tsx.snap | 77 +- .../SwapModalFooter.test.tsx.snap | 59 +- .../SwapModalHeader.test.tsx.snap | 66 +- .../__snapshots__/SwapSkeleton.test.tsx.snap | 20 +- .../UnsupportedCurrencyFooter.test.tsx.snap | 17 +- src/components/swap/styled.tsx | 46 +- src/components/vote/DelegateModal.tsx | 2 +- src/components/vote/ExecuteModal.tsx | 4 +- src/components/vote/ProposalEmptyState.tsx | 2 +- src/components/vote/QueueModal.tsx | 4 +- src/components/vote/VoteModal.tsx | 4 +- src/hooks/useTokenWarningColor.test.ts | 13 +- src/hooks/useTokenWarningColor.ts | 13 +- src/nft/components/bag/Bag.css.ts | 6 +- src/nft/components/bag/Bag.tsx | 16 +- src/nft/components/bag/BagFooter.tsx | 26 +- src/nft/components/bag/BagHeader.tsx | 12 +- src/nft/components/bag/BagRow.css.ts | 20 +- src/nft/components/bag/BagRow.tsx | 14 +- src/nft/components/bag/ButtonStates.tsx | 14 +- src/nft/components/bag/EmptyContent.tsx | 6 +- src/nft/components/bag/MobileHoverBag.css.ts | 9 +- src/nft/components/bag/MobileHoverBag.tsx | 4 +- src/nft/components/bag/TimedLoader.tsx | 2 +- .../bag/profile/ProfileAssetRow.tsx | 2 +- .../MarketplaceContainer.test.tsx.snap | 2 +- src/nft/components/card/containers.tsx | 23 +- src/nft/components/card/icons.tsx | 16 +- src/nft/components/card/media.tsx | 7 +- src/nft/components/collection/Activity.css.ts | 40 +- src/nft/components/collection/Activity.tsx | 18 +- .../components/collection/ActivityCells.tsx | 26 +- .../collection/ActivitySwitcher.css.ts | 6 +- .../collection/ActivitySwitcher.tsx | 2 +- .../collection/CollectionAssetLoading.css.ts | 2 +- .../components/collection/CollectionNfts.tsx | 17 +- .../collection/CollectionSearch.tsx | 7 +- .../collection/CollectionStats.css.ts | 8 +- .../components/collection/CollectionStats.tsx | 38 +- .../components/collection/FilterButton.css.ts | 11 +- .../components/collection/FilterButton.tsx | 1 - src/nft/components/collection/Filters.css.ts | 10 +- src/nft/components/collection/Filters.tsx | 2 +- .../collection/MarketplaceSelect.tsx | 4 +- src/nft/components/collection/PriceRange.tsx | 10 +- src/nft/components/collection/Sweep.tsx | 27 +- src/nft/components/collection/TraitChip.tsx | 6 +- src/nft/components/collection/TraitSelect.tsx | 4 +- .../components/collection/TraitsHeader.tsx | 2 +- .../TransactionCompleteModal.css.ts | 62 +- .../collection/TransactionCompleteModal.tsx | 26 +- .../CollectionAsset.test.tsx.snap | 27 +- src/nft/components/collection/shared.tsx | 4 +- .../common/Loading/LoadingSparkle.tsx | 6 +- .../common/SortDropdown/SortDropdown.tsx | 27 +- src/nft/components/details/AssetActivity.tsx | 8 +- .../components/details/AssetDetails.css.ts | 6 +- src/nft/components/details/AssetDetails.tsx | 23 +- .../details/AssetDetailsLoading.tsx | 2 +- .../components/details/AssetPriceDetails.tsx | 46 +- .../components/details/DetailsContainer.tsx | 6 +- src/nft/components/details/InfoContainer.tsx | 20 +- .../components/details/TraitsContainer.tsx | 8 +- src/nft/components/explore/Banner.tsx | 37 +- src/nft/components/explore/Carousel.tsx | 2 +- src/nft/components/explore/CarouselCard.tsx | 35 +- src/nft/components/explore/Cells/Cells.css.ts | 2 +- src/nft/components/explore/Cells/Cells.tsx | 16 +- .../components/explore/CollectionTable.tsx | 1 + src/nft/components/explore/Explore.css.ts | 6 +- src/nft/components/explore/Table.tsx | 299 +- .../explore/TrendingCollections.tsx | 10 +- src/nft/components/icons.tsx | 58 +- src/nft/components/layout/Checkbox.tsx | 4 +- src/nft/components/layout/Input.tsx | 9 +- src/nft/components/profile/list/Dropdown.tsx | 10 +- src/nft/components/profile/list/ListPage.tsx | 22 +- .../components/profile/list/ListingButton.tsx | 6 +- .../profile/list/MarketplaceRow.tsx | 14 +- .../list/Modal/BelowFloorWarningModal.tsx | 14 +- .../profile/list/Modal/ContentRow.tsx | 30 +- .../profile/list/Modal/ListModal.tsx | 6 +- .../profile/list/Modal/ListModalSection.tsx | 13 +- .../profile/list/Modal/SuccessScreen.tsx | 19 +- .../components/profile/list/NFTListRow.tsx | 8 +- .../profile/list/NFTListingsGrid.tsx | 14 +- .../profile/list/PriceTextInput.tsx | 18 +- .../profile/list/RoyaltyTooltip.tsx | 24 +- .../list/SelectMarketplacesDropdown.tsx | 18 +- .../profile/list/SetDurationModal.tsx | 16 +- .../profile/view/EmptyWalletContent.tsx | 6 +- .../components/profile/view/FilterSidebar.tsx | 10 +- .../profile/view/ProfilePage.css.ts | 2 +- .../components/profile/view/ProfilePage.tsx | 18 +- .../EmptyWalletContent.test.tsx.snap | 24 +- .../ViewMyNftsAsset.test.tsx.snap | 21 +- src/nft/css/common.css.ts | 18 +- src/nft/css/loading.css.ts | 5 +- src/nft/css/sprinkles.css.ts | 80 +- src/nft/hooks/usePriceImpact.ts | 6 +- src/nft/pages/collection/index.css.ts | 2 +- src/nft/pages/collection/index.tsx | 4 +- src/nft/pages/profile/profile.tsx | 2 +- src/nft/themes/darkTheme.ts | 45 +- src/nft/themes/lightTheme.ts | 45 +- src/pages/AddLiquidity/index.tsx | 14 +- src/pages/AddLiquidity/styled.tsx | 5 +- .../AddLiquidityV2/ConfirmAddModalBottom.tsx | 2 +- src/pages/AddLiquidityV2/PoolPriceBar.tsx | 6 +- src/pages/AddLiquidityV2/index.tsx | 18 +- src/pages/App.tsx | 14 +- src/pages/AppBody.tsx | 4 +- .../CreateProposal/ProposalActionSelector.tsx | 16 +- src/pages/CreateProposal/ProposalEditor.tsx | 8 +- .../ProposalSubmissionModal.tsx | 6 +- src/pages/CreateProposal/index.tsx | 4 +- .../Landing/__snapshots__/index.test.tsx.snap | 5621 ++++++++--------- src/pages/Landing/index.tsx | 25 +- src/pages/MigrateV2/MigrateV2Pair.tsx | 20 +- src/pages/MigrateV2/index.tsx | 6 +- src/pages/NotFound/index.tsx | 2 +- src/pages/Pool/CTACards.tsx | 13 +- src/pages/Pool/PositionPage.tsx | 55 +- src/pages/Pool/index.tsx | 19 +- src/pages/Pool/styled.tsx | 14 +- src/pages/Pool/v2.tsx | 14 +- src/pages/PoolFinder/index.tsx | 14 +- src/pages/RemoveLiquidity/V3.tsx | 36 +- src/pages/RemoveLiquidity/index.tsx | 50 +- src/pages/RemoveLiquidity/styled.tsx | 2 +- src/pages/Swap/UniswapXOptIn.tsx | 10 +- src/pages/Swap/index.tsx | 28 +- src/pages/Tokens/index.tsx | 2 +- src/pages/Vote/Landing.tsx | 24 +- src/pages/Vote/VotePage.tsx | 28 +- src/pages/Vote/styled.tsx | 10 +- src/theme/colors.ts | 147 +- .../RadialGradientByChainUpdater.ts | 36 +- src/theme/components/SegmentedControl.tsx | 12 +- src/theme/components/index.tsx | 24 +- src/theme/components/text.tsx | 67 +- src/theme/deprecatedColors.ts | 49 +- src/theme/index.tsx | 6 +- src/utils/prices.ts | 4 +- 350 files changed, 6128 insertions(+), 5643 deletions(-) create mode 100644 functions/__snapshots__/default.test.ts.snap create mode 100644 public/fonts/Basel-Book.woff create mode 100644 public/fonts/Basel-Medium.woff delete mode 100644 public/fonts/Inter-roman.var.woff2 create mode 100644 src/assets/images/buy.svg delete mode 100644 src/assets/images/gas-icon.svg create mode 100644 src/assets/svg/filter.svg create mode 100644 src/assets/svg/gas-icon.svg delete mode 100644 src/assets/svg/settings.svg delete mode 100644 src/assets/svg/share.svg create mode 100644 src/components/Icons/ArrowChangeDown.tsx create mode 100644 src/components/Icons/ArrowChangeUp.tsx create mode 100644 src/components/Icons/Gas.tsx create mode 100644 src/components/Icons/Info.tsx create mode 100644 src/components/Icons/Power.tsx create mode 100644 src/components/Icons/Search.tsx create mode 100644 src/components/Icons/Settings.tsx create mode 100644 src/components/Icons/Share.tsx diff --git a/cypress.config.ts b/cypress.config.ts index 4a08e5eb88..d2491fe956 100644 --- a/cypress.config.ts +++ b/cypress.config.ts @@ -6,7 +6,7 @@ export default defineConfig({ defaultCommandTimeout: 24000, // 2x average block time chromeWebSecurity: false, experimentalMemoryManagement: true, // better memory management, see https://github.com/cypress-io/cypress/pull/25462 - retries: { runMode: 2 }, + retries: { runMode: process.env.CYPRESS_RETRIES ? +process.env.CYPRESS_RETRIES : 2 }, video: false, // GH provides 2 CPUs, and cypress video eats one up, see https://github.com/cypress-io/cypress/issues/20468#issuecomment-1307608025 e2e: { async setupNodeEvents(on, config) { diff --git a/cypress/e2e/token-details.test.ts b/cypress/e2e/token-details.test.ts index 382a35623d..ed9116d44d 100644 --- a/cypress/e2e/token-details.test.ts +++ b/cypress/e2e/token-details.test.ts @@ -108,7 +108,7 @@ describe('Token details', () => { it('should automatically navigate to the new TDP', () => { cy.get(`#swap-currency-output .open-currency-select-button`).click() - cy.contains('WETH').click() + cy.get('[data-reach-dialog-content]').contains('WETH').click() cy.url().should('include', `${WETH9[1].address}`) cy.url().should('not.include', `${UNI_MAINNET.address}`) }) diff --git a/cypress/e2e/wallet-dropdown.test.ts b/cypress/e2e/wallet-dropdown.test.ts index 24d711289b..46246eab48 100644 --- a/cypress/e2e/wallet-dropdown.test.ts +++ b/cypress/e2e/wallet-dropdown.test.ts @@ -115,7 +115,7 @@ describe('Wallet Dropdown', () => { cy.get(getTestSelector('web3-status-connected')).click() cy.get(getTestSelector('wallet-settings')).click() cy.get(getTestSelector('theme-auto')).click() - cy.get(getTestSelector('wallet-header')).should('have.css', 'color', 'rgb(152, 161, 192)') + cy.get(getTestSelector('wallet-header')).should('have.css', 'color', 'rgb(155, 155, 155)') }) it('should properly use light system theme when auto theme setting is selected', () => { @@ -123,7 +123,7 @@ describe('Wallet Dropdown', () => { cy.get(getTestSelector('web3-status-connected')).click() cy.get(getTestSelector('wallet-settings')).click() cy.get(getTestSelector('theme-auto')).click() - cy.get(getTestSelector('wallet-header')).should('have.css', 'color', 'rgb(119, 128, 160)') + cy.get(getTestSelector('wallet-header')).should('have.css', 'color', 'rgb(125, 125, 125)') }) }) diff --git a/functions/__snapshots__/default.test.ts.snap b/functions/__snapshots__/default.test.ts.snap new file mode 100644 index 0000000000..c008820149 --- /dev/null +++ b/functions/__snapshots__/default.test.ts.snap @@ -0,0 +1,439 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`should inject metadata for valid collections 1`] = ` +" + + + + + Uniswap Interface + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + +" +`; + +exports[`should inject metadata for valid collections 2`] = ` +" + + + + + Uniswap Interface + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + +" +`; + +exports[`should inject metadata for valid collections 3`] = ` +" + + + + + Uniswap Interface + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + +" +`; diff --git a/functions/nfts/asset/__snapshots__/nft.test.ts.snap b/functions/nfts/asset/__snapshots__/nft.test.ts.snap index be59fe1c36..5e28bc5a98 100644 --- a/functions/nfts/asset/__snapshots__/nft.test.ts.snap +++ b/functions/nfts/asset/__snapshots__/nft.test.ts.snap @@ -37,31 +37,43 @@ exports[`should inject metadata for valid assets 1`] = ` --> - + + +