From 13c5c916d8aaf5c1f8386aa6c94d42f0e168d029 Mon Sep 17 00:00:00 2001 From: Mark Grothe Date: Fri, 3 Jan 2025 04:03:03 -0600 Subject: [PATCH 1/6] fix: add watch to mobile menu [skip cypress] (#2300) --- src/layouts/MobileMenu.tsx | 12 ++++++++++++ src/locales/en/messages.po | 1 + 2 files changed, 13 insertions(+) diff --git a/src/layouts/MobileMenu.tsx b/src/layouts/MobileMenu.tsx index 74937ad5d2..2559e6c8c2 100644 --- a/src/layouts/MobileMenu.tsx +++ b/src/layouts/MobileMenu.tsx @@ -13,6 +13,7 @@ import { Typography, } from '@mui/material'; import React, { ReactNode, useEffect, useState } from 'react'; +import { useModalContext } from 'src/hooks/useModal'; import { PROD_ENV } from 'src/utils/marketsAndNetworksConfig'; import { Link } from '../components/primitives/Link'; @@ -47,9 +48,15 @@ const MenuItemsWrapper = ({ children, title }: { children: ReactNode; title: Rea export const MobileMenu = ({ open, setOpen, headerHeight }: MobileMenuProps) => { const { i18n } = useLingui(); const [isLanguagesListOpen, setIsLanguagesListOpen] = useState(false); + const { openReadMode } = useModalContext(); useEffect(() => setIsLanguagesListOpen(false), [open]); + const handleOpenReadMode = () => { + setOpen(false); + openReadMode(); + }; + return ( <> {open ? ( @@ -82,6 +89,11 @@ export const MobileMenu = ({ open, setOpen, headerHeight }: MobileMenuProps) => Links}> + + + Watch wallet + + Date: Fri, 3 Jan 2025 12:09:39 +0000 Subject: [PATCH 2/6] chore(i18n): synchronize translations from crowdin [skip cypress] --- src/locales/de/messages.po | 3 ++- src/locales/el/messages.po | 3 ++- src/locales/es/messages.po | 3 ++- src/locales/fr/messages.po | 3 ++- src/locales/ru/messages.po | 3 ++- src/locales/zh/messages.po | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/locales/de/messages.po b/src/locales/de/messages.po index 8694f2e5f0..e1c06b2374 100644 --- a/src/locales/de/messages.po +++ b/src/locales/de/messages.po @@ -8,7 +8,7 @@ msgstr "" "Language: de\n" "Project-Id-Version: aave-interface\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2025-01-02 18:06\n" +"PO-Revision-Date: 2025-01-03 12:08\n" "Last-Translator: \n" "Language-Team: German\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -769,6 +769,7 @@ msgstr "Bitte verbinden Sie Ihre Wallet, um das Migrationstool anzuzeigen." msgid "{networkName} Faucet" msgstr "{networkName} Hahn" +#: src/layouts/MobileMenu.tsx #: src/layouts/SettingsMenu.tsx msgid "Watch wallet" msgstr "" diff --git a/src/locales/el/messages.po b/src/locales/el/messages.po index a81771ff87..c964c31938 100644 --- a/src/locales/el/messages.po +++ b/src/locales/el/messages.po @@ -8,7 +8,7 @@ msgstr "" "Language: el\n" "Project-Id-Version: aave-interface\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2025-01-02 18:06\n" +"PO-Revision-Date: 2025-01-03 12:08\n" "Last-Translator: \n" "Language-Team: Greek\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -770,6 +770,7 @@ msgstr "" msgid "{networkName} Faucet" msgstr "{networkName} Βρύση" +#: src/layouts/MobileMenu.tsx #: src/layouts/SettingsMenu.tsx msgid "Watch wallet" msgstr "" diff --git a/src/locales/es/messages.po b/src/locales/es/messages.po index f23cb052d7..c09113f77f 100644 --- a/src/locales/es/messages.po +++ b/src/locales/es/messages.po @@ -8,7 +8,7 @@ msgstr "" "Language: es\n" "Project-Id-Version: aave-interface\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2025-01-02 18:06\n" +"PO-Revision-Date: 2025-01-03 12:08\n" "Last-Translator: \n" "Language-Team: Spanish\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -769,6 +769,7 @@ msgstr "Por favor conecta tu cartera para ver la herramienta de migración." msgid "{networkName} Faucet" msgstr "Faucet {networkName}" +#: src/layouts/MobileMenu.tsx #: src/layouts/SettingsMenu.tsx msgid "Watch wallet" msgstr "" diff --git a/src/locales/fr/messages.po b/src/locales/fr/messages.po index 3b885aa993..df60e66337 100644 --- a/src/locales/fr/messages.po +++ b/src/locales/fr/messages.po @@ -8,7 +8,7 @@ msgstr "" "Language: fr\n" "Project-Id-Version: aave-interface\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2025-01-02 18:06\n" +"PO-Revision-Date: 2025-01-03 12:08\n" "Last-Translator: \n" "Language-Team: French\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" @@ -769,6 +769,7 @@ msgstr "Veuillez connecter votre portefeuille pour voir l’outil de migration." msgid "{networkName} Faucet" msgstr "{networkName} Robinet" +#: src/layouts/MobileMenu.tsx #: src/layouts/SettingsMenu.tsx msgid "Watch wallet" msgstr "" diff --git a/src/locales/ru/messages.po b/src/locales/ru/messages.po index 4aa246d883..f35c3c830a 100644 --- a/src/locales/ru/messages.po +++ b/src/locales/ru/messages.po @@ -8,7 +8,7 @@ msgstr "" "Language: ru\n" "Project-Id-Version: aave-interface\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2025-01-02 18:06\n" +"PO-Revision-Date: 2025-01-03 12:08\n" "Last-Translator: \n" "Language-Team: Russian\n" "Plural-Forms: nplurals=4; plural=((n%10==1 && n%100!=11) ? 0 : ((n%10 >= 2 && n%10 <=4 && (n%100 < 12 || n%100 > 14)) ? 1 : ((n%10 == 0 || (n%10 >= 5 && n%10 <=9)) || (n%100 >= 11 && n%100 <= 14)) ? 2 : 3));\n" @@ -769,6 +769,7 @@ msgstr "Пожалуйста, подключите свой кошелек, чт msgid "{networkName} Faucet" msgstr "{networkName} Водопроводный кран" +#: src/layouts/MobileMenu.tsx #: src/layouts/SettingsMenu.tsx msgid "Watch wallet" msgstr "" diff --git a/src/locales/zh/messages.po b/src/locales/zh/messages.po index 319c00585e..128f158e6f 100644 --- a/src/locales/zh/messages.po +++ b/src/locales/zh/messages.po @@ -8,7 +8,7 @@ msgstr "" "Language: zh\n" "Project-Id-Version: aave-interface\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2025-01-02 18:06\n" +"PO-Revision-Date: 2025-01-03 12:08\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Plural-Forms: nplurals=1; plural=0;\n" @@ -769,6 +769,7 @@ msgstr "请连接您的钱包以查看迁移工具。" msgid "{networkName} Faucet" msgstr "{networkName} 龙头" +#: src/layouts/MobileMenu.tsx #: src/layouts/SettingsMenu.tsx msgid "Watch wallet" msgstr "" From 25803d97c68ff58ea62f1a298807f3bbca58103b Mon Sep 17 00:00:00 2001 From: Mark Grothe Date: Fri, 3 Jan 2025 07:44:22 -0600 Subject: [PATCH 3/6] chore: ci fix (#2298) Co-authored-by: Alex Gomez --- .github/actions/analyze-comment/action.yml | 29 +++++++++++++++++++-- .github/actions/upload-artifacts/action.yml | 3 --- .github/workflows/build-test-deploy.yml | 4 +-- .github/workflows/update-prod-staging.yml | 2 +- 4 files changed, 30 insertions(+), 8 deletions(-) diff --git a/.github/actions/analyze-comment/action.yml b/.github/actions/analyze-comment/action.yml index 3f30c3f60c..4f54eb6fd2 100644 --- a/.github/actions/analyze-comment/action.yml +++ b/.github/actions/analyze-comment/action.yml @@ -10,6 +10,7 @@ runs: steps: - name: Download PR bundle stats if: github.event.workflow_run.id + continue-on-error: true uses: dawidd6/action-download-artifact@ea71f332a90fd52416b1629b933dcf7e0ccd421d # v2.22.0 with: workflow: build-fork.yml @@ -32,16 +33,40 @@ runs: - name: Download base branch bundle stats uses: dawidd6/action-download-artifact@ea71f332a90fd52416b1629b933dcf7e0ccd421d # v2.22.0 if: github.event_name != 'push' + continue-on-error: true with: workflow: build-test-deploy.yml branch: main name: bundle path: .next/analyze/base/bundle/ - - name: Compare with base branch bundle + - name: Handle missing bundle if: github.event_name != 'push' + shell: bash + run: | + if [ ! -d ".next/analyze/base/bundle" ]; then + echo "No base bundle found, creating baseline" + mkdir -p .next/analyze/base/bundle + if [ -f ".next/analyze/__bundle_analysis.json" ]; then + cp .next/analyze/__bundle_analysis.json .next/analyze/base/bundle/ + echo "Baseline bundle created successfully" + else + echo "Warning: Source bundle analysis file not found" + echo "{}" > .next/analyze/base/bundle/__bundle_analysis.json + echo "Created empty baseline bundle" + fi + fi + + - name: Compare with base branch bundle + if: github.event_name != 'push' && !contains(github.ref, 'main') shell: sh - run: ls -laR .next/analyze/base && npx -p nextjs-bundle-analysis compare + run: | + if [ -d ".next/analyze/base/bundle" ]; then + ls -laR .next/analyze/base && npx -p nextjs-bundle-analysis compare + else + echo "No base bundle found for comparison. Skipping comparison step." + cp .next/analyze/__bundle_analysis.json .next/analyze/__bundle_analysis_comment.txt + fi - name: Get comment body id: get-comment-body diff --git a/.github/actions/upload-artifacts/action.yml b/.github/actions/upload-artifacts/action.yml index e4b23e423a..57547d6ec9 100644 --- a/.github/actions/upload-artifacts/action.yml +++ b/.github/actions/upload-artifacts/action.yml @@ -29,14 +29,12 @@ runs: name: pr path: __pr/ retention-days: 10 - - name: store static build uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0 with: name: '${{ inputs.BUILD_ARTIFACT_NAME }}' path: out/ retention-days: 10 - - name: store nextjs build if: inputs.NEXTJS_BUILD == 'true' uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0 @@ -46,4 +44,3 @@ runs: .next !.next/cache retention-days: 10 - diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml index 4bf205ada0..3a99794bec 100644 --- a/.github/workflows/build-test-deploy.yml +++ b/.github/workflows/build-test-deploy.yml @@ -114,7 +114,7 @@ jobs: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2 - name: download build - uses: actions/download-artifact@v4.1.8 # v3.0.0 + uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 # v3.0.0 with: name: nextjs_build path: .next @@ -137,7 +137,7 @@ jobs: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2 - name: download build - uses: actions/download-artifact@v4.1.8 # v3.0.0 + uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 # v3.0.0 with: name: out path: out diff --git a/.github/workflows/update-prod-staging.yml b/.github/workflows/update-prod-staging.yml index eff6e06763..fd5233e61b 100644 --- a/.github/workflows/update-prod-staging.yml +++ b/.github/workflows/update-prod-staging.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2 - name: download build - uses: actions/download-artifact@v4.1.8 # v3.0.0 + uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 # v3.0.0 with: name: ${{ matrix.environment.artifact }} path: ${{ matrix.environment.build_path }} From 954284ddeab48198d345180e4cfbb2d328f6ba3c Mon Sep 17 00:00:00 2001 From: Mark Grothe Date: Fri, 3 Jan 2025 10:29:55 -0600 Subject: [PATCH 4/6] fix: provide fallback rpcs (#2303) --- src/ui-config/wagmiConfig.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/ui-config/wagmiConfig.ts b/src/ui-config/wagmiConfig.ts index 40a2056d5e..6f5e6e5e4c 100644 --- a/src/ui-config/wagmiConfig.ts +++ b/src/ui-config/wagmiConfig.ts @@ -8,7 +8,7 @@ import { networkConfigs, } from 'src/utils/marketsAndNetworksConfig'; import { type Chain } from 'viem'; -import { createConfig, CreateConfigParameters, injected } from 'wagmi'; +import { createConfig, CreateConfigParameters, http, injected } from 'wagmi'; import { arbitrum, arbitrumSepolia, @@ -88,9 +88,17 @@ const cypressConfig = createConfig( }) ); +const getTransport = (chainId: number) => { + return networkConfigs[chainId].publicJsonRPCUrl[0]; +}; + +const buildTransports = (chains: CreateConfigParameters['chains']) => + Object.fromEntries(chains.map((chain) => [chain.id, http(getTransport(chain.id))])); + const prodConfig = createConfig( getDefaultConfig({ chains: ENABLE_TESTNET ? testnetChains : prodChains, + transports: ENABLE_TESTNET ? undefined : buildTransports(prodChains), ...defaultConfig, }) ); From 018d5915c3ea242660d2ef68cca9fc7af94514db Mon Sep 17 00:00:00 2001 From: Alex <101551092+alexmance@users.noreply.github.com> Date: Fri, 3 Jan 2025 17:51:51 +0100 Subject: [PATCH 5/6] adding build for cypress test (#2302) --- .github/actions/cypress/action.yml | 4 ++-- .github/workflows/build-test-deploy-dev.yml | 11 +++++++++-- .github/workflows/build-test-deploy.yml | 11 +++++++++-- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/.github/actions/cypress/action.yml b/.github/actions/cypress/action.yml index fd296972d9..98a684e217 100644 --- a/.github/actions/cypress/action.yml +++ b/.github/actions/cypress/action.yml @@ -31,7 +31,7 @@ runs: if: github.event_name != 'workflow_run' uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 # v3.0.0 with: - name: out + name: out_cypress path: out - name: Download static build @@ -41,7 +41,7 @@ runs: workflow: build-fork.yml run_id: ${{ github.event.workflow_run.id }} workflow_conclusion: success - name: out + name: out_cypress path: out - name: test diff --git a/.github/workflows/build-test-deploy-dev.yml b/.github/workflows/build-test-deploy-dev.yml index 33bfb13e05..6280b7dd6c 100644 --- a/.github/workflows/build-test-deploy-dev.yml +++ b/.github/workflows/build-test-deploy-dev.yml @@ -15,6 +15,13 @@ jobs: (github.event_name == 'push' && github.event_name == 'pull_request') || (github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name && !contains(github.head_ref, 'dependabot')) + strategy: + matrix: + build: + - name: 'out' + cypress_enabled: 'false' + - name: 'out_cypress' + cypress_enabled: 'true' steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2 with: @@ -31,12 +38,12 @@ jobs: NEXT_PUBLIC_FIAT_ON_RAMP: 'false' NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID: ${{ secrets.WALLET_CONNECT_PROJECT_ID }} NEXT_PUBLIC_SUBGRAPH_API_KEY: ${{ secrets.NEXT_PUBLIC_SUBGRAPH_API_KEY }} - NEXT_PUBLIC_IS_CYPRESS_ENABLED: 'true' + NEXT_PUBLIC_IS_CYPRESS_ENABLED: ${{ matrix.build.cypress_enabled }} - name: Upload artifacts uses: ./.github/actions/upload-artifacts with: - BUILD_ARTIFACT_NAME: 'out' + BUILD_ARTIFACT_NAME: ${{ matrix.build.name }} cypress_smoke_v2: runs-on: ubuntu-latest diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml index 3a99794bec..2b480c10b2 100644 --- a/.github/workflows/build-test-deploy.yml +++ b/.github/workflows/build-test-deploy.yml @@ -15,6 +15,13 @@ jobs: (github.event_name == 'push' && github.ref == 'refs/heads/main') || (github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name && !contains(github.head_ref, 'dependabot')) + strategy: + matrix: + build: + - name: 'out' + cypress_enabled: 'false' + - name: 'out_cypress' + cypress_enabled: 'true' steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2 with: @@ -31,12 +38,12 @@ jobs: NEXT_PUBLIC_FIAT_ON_RAMP: 'false' NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID: ${{ secrets.WALLET_CONNECT_PROJECT_ID }} NEXT_PUBLIC_SUBGRAPH_API_KEY: ${{ secrets.NEXT_PUBLIC_SUBGRAPH_API_KEY }} - NEXT_PUBLIC_IS_CYPRESS_ENABLED: 'false' + NEXT_PUBLIC_IS_CYPRESS_ENABLED: ${{ matrix.build.cypress_enabled }} - name: Upload artifacts uses: ./.github/actions/upload-artifacts with: - BUILD_ARTIFACT_NAME: 'out' + BUILD_ARTIFACT_NAME: ${{ matrix.build.name }} build_staging: runs-on: ubuntu-latest From 8b89cec085ffe40c2b0b81a3f7ccfa72ea32452b Mon Sep 17 00:00:00 2001 From: Mark Hinschberger Date: Fri, 3 Jan 2025 17:17:57 +0000 Subject: [PATCH 6/6] chore: add ausd [skip cypress] (#2301) --- public/icons/tokens/ausd.svg | 1 + src/ui-config/networksConfig.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 public/icons/tokens/ausd.svg diff --git a/public/icons/tokens/ausd.svg b/public/icons/tokens/ausd.svg new file mode 100644 index 0000000000..18fdbf2555 --- /dev/null +++ b/public/icons/tokens/ausd.svg @@ -0,0 +1 @@ + diff --git a/src/ui-config/networksConfig.ts b/src/ui-config/networksConfig.ts index 6fe0203842..f121944c86 100644 --- a/src/ui-config/networksConfig.ts +++ b/src/ui-config/networksConfig.ts @@ -95,7 +95,7 @@ export const networkConfigs: Record = { 'https://rpc.ankr.com/eth', 'https://rpc.flashbots.net', 'https://eth-mainnet.public.blastapi.io', - 'https://cloudflare-eth.com/v1/mainnet', + //'https://cloudflare-eth.com/v1/mainnet', ], publicJsonRPCWSUrl: 'wss://eth-mainnet.alchemyapi.io/v2/demo', baseUniswapAdapter: '0xc3efa200a60883a96ffe3d5b492b121d6e9a1f3f',