diff --git a/.gitattributes b/.gitattributes index 5bf0449f..eae90de5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -24,3 +24,5 @@ prover/prover-assets/**/**/**/*.bin binary prover/prover-assets/**/**/**/**/*.bin binary prover/prover-assets/kzgsrs/* binary +*.woff2 binary + diff --git a/.github/workflows/bridge-ui-e2e-tests.yml b/.github/workflows/bridge-ui-e2e-tests.yml index e9a67007..42c502cc 100644 --- a/.github/workflows/bridge-ui-e2e-tests.yml +++ b/.github/workflows/bridge-ui-e2e-tests.yml @@ -39,6 +39,7 @@ jobs: NEXT_PUBLIC_WALLET_CONNECT_ID: ${{ secrets.PUBLIC_WALLET_CONNECT_ID }} NEXT_PUBLIC_INFURA_ID: ${{ secrets.PUBLIC_BRIDGE_UI_INFURA_ID }} NEXT_PUBLIC_DYNAMIC_ENVIRONMENT_ID: ${{ secrets.PUBLIC_DYNAMIC_ENVIRONMENT_ID }} + NEXT_PUBLIC_LIFI_API_KEY: ${{ secrets.PUBLIC_LIFI_API_KEY }} - name: Install linux dependencies run: | diff --git a/.github/workflows/bridge-ui-publish.yml b/.github/workflows/bridge-ui-publish.yml index fcde994a..0bc036b2 100644 --- a/.github/workflows/bridge-ui-publish.yml +++ b/.github/workflows/bridge-ui-publish.yml @@ -56,18 +56,19 @@ jobs: file: ./bridge-ui/Dockerfile push: ${{ env.DOCKERHUB_USERNAME != '' && env.DOCKERHUB_TOKEN != '' }} tags: consensys/linea-bridge-ui:${{ env.DOCKER_TAG }} - # Env file dedicated for dev build-args: | ENV_FILE=./bridge-ui/.env.production - NEXT_PUBLIC_WALLET_CONNECT_ID=${{ secrets.PUBLIC_WALLET_CONNECT_ID }} - NEXT_PUBLIC_INFURA_ID=${{ secrets.PUBLIC_BRIDGE_UI_INFURA_ID }} - NEXT_PUBLIC_DYNAMIC_ENVIRONMENT_ID=${{ secrets.PUBLIC_DYNAMIC_ENVIRONMENT_ID }} + NEXT_PUBLIC_WALLET_CONNECT_ID=${{ env.NEXT_PUBLIC_WALLET_CONNECT_ID }} + NEXT_PUBLIC_INFURA_ID=${{ env.NEXT_PUBLIC_INFURA_ID }} + NEXT_PUBLIC_DYNAMIC_ENVIRONMENT_ID=${{ env.NEXT_PUBLIC_DYNAMIC_ENVIRONMENT_ID }} + NEXT_PUBLIC_LIFI_API_KEY=${{ env.NEXT_PUBLIC_LIFI_API_KEY }} cache-from: type=registry,ref=consensys/linea-bridge-ui:buildcache cache-to: type=registry,ref=consensys/linea-bridge-ui:buildcache,mode=max env: NEXT_PUBLIC_WALLET_CONNECT_ID: ${{ secrets.PUBLIC_WALLET_CONNECT_ID }} NEXT_PUBLIC_INFURA_ID: ${{ secrets.PUBLIC_BRIDGE_UI_INFURA_ID }} NEXT_PUBLIC_DYNAMIC_ENVIRONMENT_ID: ${{ secrets.PUBLIC_DYNAMIC_ENVIRONMENT_ID }} + NEXT_PUBLIC_LIFI_API_KEY: ${{ secrets.PUBLIC_LIFI_API_KEY }} test-build: if: github.event.pull_request.head.repo.fork == true diff --git a/bridge-ui/.env.production b/bridge-ui/.env.production index 4ea99f3b..40d0e7b3 100644 --- a/bridge-ui/.env.production +++ b/bridge-ui/.env.production @@ -7,7 +7,7 @@ NEXT_PUBLIC_MAINNET_LINEA_USDC_BRIDGE=0xA2Ee6Fce4ACB62D95448729cDb781e3BEb62504A NEXT_PUBLIC_MAINNET_GAS_ESTIMATED=100000 NEXT_PUBLIC_MAINNET_DEFAULT_GAS_LIMIT_SURPLUS=6000 NEXT_PUBLIC_MAINNET_PROFIT_MARGIN=2 -MAINNET_TOKEN_LIST=https://raw.githubusercontent.com/Consensys/linea-token-list/main/json/linea-mainnet-token-shortlist.json +NEXT_PUBLIC_MAINNET_TOKEN_LIST=https://raw.githubusercontent.com/Consensys/linea-token-list/main/json/linea-mainnet-token-shortlist.json NEXT_PUBLIC_SEPOLIA_L1_TOKEN_BRIDGE=0x5A0a48389BB0f12E5e017116c1105da97E129142 NEXT_PUBLIC_SEPOLIA_LINEA_TOKEN_BRIDGE=0x93DcAdf238932e6e6a85852caC89cBd71798F463 @@ -18,7 +18,7 @@ NEXT_PUBLIC_SEPOLIA_LINEA_USDC_BRIDGE=0x39fd5cF710314341d35f9Dca20c1daa059Acb843 NEXT_PUBLIC_SEPOLIA_GAS_ESTIMATED=100000 NEXT_PUBLIC_SEPOLIA_DEFAULT_GAS_LIMIT_SURPLUS=6000 NEXT_PUBLIC_SEPOLIA_PROFIT_MARGIN=2 -SEPOLIA_TOKEN_LIST=https://raw.githubusercontent.com/Consensys/linea-token-list/main/json/linea-sepolia-token-shortlist.json +NEXT_PUBLIC_SEPOLIA_TOKEN_LIST=https://raw.githubusercontent.com/Consensys/linea-token-list/main/json/linea-sepolia-token-shortlist.json NEXT_PUBLIC_WALLET_CONNECT_ID= NEXT_PUBLIC_DYNAMIC_ENVIRONMENT_ID= diff --git a/bridge-ui/.env.template b/bridge-ui/.env.template index bbcd86f3..c08692fb 100644 --- a/bridge-ui/.env.template +++ b/bridge-ui/.env.template @@ -7,7 +7,7 @@ NEXT_PUBLIC_MAINNET_LINEA_USDC_BRIDGE=0xA2Ee6Fce4ACB62D95448729cDb781e3BEb62504A NEXT_PUBLIC_MAINNET_GAS_ESTIMATED=100000 NEXT_PUBLIC_MAINNET_DEFAULT_GAS_LIMIT_SURPLUS=6000 NEXT_PUBLIC_MAINNET_PROFIT_MARGIN=2 -MAINNET_TOKEN_LIST=https://raw.githubusercontent.com/Consensys/linea-token-list/main/json/linea-mainnet-token-shortlist.json +NEXT_PUBLIC_MAINNET_TOKEN_LIST=https://raw.githubusercontent.com/Consensys/linea-token-list/main/json/linea-mainnet-token-shortlist.json NEXT_PUBLIC_SEPOLIA_L1_TOKEN_BRIDGE=0x5A0a48389BB0f12E5e017116c1105da97E129142 NEXT_PUBLIC_SEPOLIA_LINEA_TOKEN_BRIDGE=0x93DcAdf238932e6e6a85852caC89cBd71798F463 @@ -18,7 +18,7 @@ NEXT_PUBLIC_SEPOLIA_LINEA_USDC_BRIDGE=0x39fd5cF710314341d35f9Dca20c1daa059Acb843 NEXT_PUBLIC_SEPOLIA_GAS_ESTIMATED=100000 NEXT_PUBLIC_SEPOLIA_DEFAULT_GAS_LIMIT_SURPLUS=6000 NEXT_PUBLIC_SEPOLIA_PROFIT_MARGIN=2 -SEPOLIA_TOKEN_LIST=https://raw.githubusercontent.com/Consensys/linea-token-list/main/json/linea-sepolia-token-shortlist.json +NEXT_PUBLIC_SEPOLIA_TOKEN_LIST=https://raw.githubusercontent.com/Consensys/linea-token-list/main/json/linea-sepolia-token-shortlist.json NEXT_PUBLIC_WALLET_CONNECT_ID= NEXT_PUBLIC_DYNAMIC_ENVIRONMENT_ID= diff --git a/bridge-ui/Dockerfile b/bridge-ui/Dockerfile index 0e75956c..1a14387a 100644 --- a/bridge-ui/Dockerfile +++ b/bridge-ui/Dockerfile @@ -9,9 +9,11 @@ FROM base AS builder ARG NEXT_PUBLIC_WALLET_CONNECT_ID ARG NEXT_PUBLIC_INFURA_ID ARG NEXT_PUBLIC_DYNAMIC_ENVIRONMENT_ID +ARG NEXT_PUBLIC_LIFI_API_KEY ENV NEXT_PUBLIC_WALLET_CONNECT_ID=$NEXT_PUBLIC_WALLET_CONNECT_ID ENV NEXT_PUBLIC_INFURA_ID=$NEXT_PUBLIC_INFURA_ID ENV NEXT_PUBLIC_DYNAMIC_ENVIRONMENT_ID=$NEXT_PUBLIC_DYNAMIC_ENVIRONMENT_ID +ENV NEXT_PUBLIC_LIFI_API_KEY=$NEXT_PUBLIC_LIFI_API_KEY ARG ENV_FILE WORKDIR /app diff --git a/bridge-ui/package.json b/bridge-ui/package.json index e45eff53..a77e148d 100644 --- a/bridge-ui/package.json +++ b/bridge-ui/package.json @@ -21,13 +21,14 @@ }, "dependencies": { "@consensys/linea-sdk": "0.3.0", - "@dynamic-labs/ethereum": "4.6.3", - "@dynamic-labs/sdk-react-core": "4.6.3", - "@dynamic-labs/wagmi-connector": "4.6.3", + "@dynamic-labs/ethereum": "4.9.5", + "@dynamic-labs/sdk-react-core": "4.9.5", + "@dynamic-labs/wagmi-connector": "4.9.5", "@headlessui/react": "2.1.9", - "@tanstack/react-query": "5.62.16", - "@wagmi/connectors": "5.1.15", - "@wagmi/core": "2.16.3", + "@lifi/widget": "3.18.1", + "@tanstack/react-query": "5.69.0", + "@wagmi/connectors": "5.7.11", + "@wagmi/core": "2.16.7", "auto-zustand-selectors-hook": "3.0.1", "clsx": "2.1.1", "date-fns": "4.1.0", @@ -35,14 +36,14 @@ "loglevel": "1.9.2", "next": "14.2.24", "next-seo": "6.6.0", - "pino-pretty": "11.2.2", + "pino-pretty": "13.0.0", "react": "18.3.1", "react-dom": "18.3.1", - "react-icons": "5.3.0", - "sass": "1.83.3", + "react-icons": "5.5.0", + "sass": "1.86.0", "sharp": "0.33.5", - "viem": "2.22.4", - "wagmi": "2.14.6", + "viem": "2.23.13", + "wagmi": "2.14.15", "zod": "3.24.2", "zustand": "4.5.4" }, @@ -53,9 +54,9 @@ "@types/fs-extra": "11.0.4", "@types/react": "18.3.11", "@types/react-dom": "18.3.0", - "autoprefixer": "10.4.20", - "dotenv": "16.4.5", + "autoprefixer": "10.4.21", + "dotenv": "16.4.7", "eslint-config-next": "14.2.15", - "postcss": "8.4.47" + "postcss": "8.5.3" } } diff --git a/bridge-ui/public/fonts/AtypDisplay-Bold-subset.woff2 b/bridge-ui/public/fonts/AtypDisplay-Bold-subset.woff2 index 4e874e12..966f6452 100644 Binary files a/bridge-ui/public/fonts/AtypDisplay-Bold-subset.woff2 and b/bridge-ui/public/fonts/AtypDisplay-Bold-subset.woff2 differ diff --git a/bridge-ui/public/fonts/AtypDisplay-Bold.woff2 b/bridge-ui/public/fonts/AtypDisplay-Bold.woff2 deleted file mode 100644 index 5ae715f2..00000000 Binary files a/bridge-ui/public/fonts/AtypDisplay-Bold.woff2 and /dev/null differ diff --git a/bridge-ui/public/fonts/AtypDisplay-BoldItalic.woff2 b/bridge-ui/public/fonts/AtypDisplay-BoldItalic.woff2 deleted file mode 100644 index 704ef927..00000000 Binary files a/bridge-ui/public/fonts/AtypDisplay-BoldItalic.woff2 and /dev/null differ diff --git a/bridge-ui/public/fonts/AtypDisplay-Italic.woff2 b/bridge-ui/public/fonts/AtypDisplay-Italic.woff2 deleted file mode 100644 index 02fab60d..00000000 Binary files a/bridge-ui/public/fonts/AtypDisplay-Italic.woff2 and /dev/null differ diff --git a/bridge-ui/public/fonts/AtypDisplay-Light-subset.woff2 b/bridge-ui/public/fonts/AtypDisplay-Light-subset.woff2 deleted file mode 100644 index 50622476..00000000 Binary files a/bridge-ui/public/fonts/AtypDisplay-Light-subset.woff2 and /dev/null differ diff --git a/bridge-ui/public/fonts/AtypDisplay-Light.woff2 b/bridge-ui/public/fonts/AtypDisplay-Light.woff2 deleted file mode 100644 index 1352b593..00000000 Binary files a/bridge-ui/public/fonts/AtypDisplay-Light.woff2 and /dev/null differ diff --git a/bridge-ui/public/fonts/AtypDisplay-LightItalic.woff2 b/bridge-ui/public/fonts/AtypDisplay-LightItalic.woff2 deleted file mode 100644 index 1ef32c3a..00000000 Binary files a/bridge-ui/public/fonts/AtypDisplay-LightItalic.woff2 and /dev/null differ diff --git a/bridge-ui/public/fonts/AtypDisplay-Medium-subset.woff2 b/bridge-ui/public/fonts/AtypDisplay-Medium-subset.woff2 index de9908cf..03b07a54 100644 Binary files a/bridge-ui/public/fonts/AtypDisplay-Medium-subset.woff2 and b/bridge-ui/public/fonts/AtypDisplay-Medium-subset.woff2 differ diff --git a/bridge-ui/public/fonts/AtypDisplay-Medium.woff2 b/bridge-ui/public/fonts/AtypDisplay-Medium.woff2 deleted file mode 100644 index e10aa48a..00000000 Binary files a/bridge-ui/public/fonts/AtypDisplay-Medium.woff2 and /dev/null differ diff --git a/bridge-ui/public/fonts/AtypDisplay-MediumItalic.woff2 b/bridge-ui/public/fonts/AtypDisplay-MediumItalic.woff2 deleted file mode 100644 index 9199f0fb..00000000 Binary files a/bridge-ui/public/fonts/AtypDisplay-MediumItalic.woff2 and /dev/null differ diff --git a/bridge-ui/public/fonts/AtypDisplay-Regular-subset.woff2 b/bridge-ui/public/fonts/AtypDisplay-Regular-subset.woff2 index e441d17a..276c32f3 100644 Binary files a/bridge-ui/public/fonts/AtypDisplay-Regular-subset.woff2 and b/bridge-ui/public/fonts/AtypDisplay-Regular-subset.woff2 differ diff --git a/bridge-ui/public/fonts/AtypDisplay-Regular.woff2 b/bridge-ui/public/fonts/AtypDisplay-Regular.woff2 deleted file mode 100644 index 3115f481..00000000 Binary files a/bridge-ui/public/fonts/AtypDisplay-Regular.woff2 and /dev/null differ diff --git a/bridge-ui/public/fonts/AtypDisplay-Semibold-subset.woff2 b/bridge-ui/public/fonts/AtypDisplay-Semibold-subset.woff2 index 85289a99..50e5b404 100644 Binary files a/bridge-ui/public/fonts/AtypDisplay-Semibold-subset.woff2 and b/bridge-ui/public/fonts/AtypDisplay-Semibold-subset.woff2 differ diff --git a/bridge-ui/public/fonts/AtypDisplay-Semibold.woff2 b/bridge-ui/public/fonts/AtypDisplay-Semibold.woff2 deleted file mode 100644 index bb53c702..00000000 Binary files a/bridge-ui/public/fonts/AtypDisplay-Semibold.woff2 and /dev/null differ diff --git a/bridge-ui/public/fonts/AtypDisplay-SemiboldItalic.woff2 b/bridge-ui/public/fonts/AtypDisplay-SemiboldItalic.woff2 deleted file mode 100644 index b686fb29..00000000 Binary files a/bridge-ui/public/fonts/AtypDisplay-SemiboldItalic.woff2 and /dev/null differ diff --git a/bridge-ui/public/fonts/AtypText-Bold-subset.woff2 b/bridge-ui/public/fonts/AtypText-Bold-subset.woff2 index 978b9641..37931ea9 100644 Binary files a/bridge-ui/public/fonts/AtypText-Bold-subset.woff2 and b/bridge-ui/public/fonts/AtypText-Bold-subset.woff2 differ diff --git a/bridge-ui/public/fonts/AtypText-Bold.woff2 b/bridge-ui/public/fonts/AtypText-Bold.woff2 deleted file mode 100644 index 52760497..00000000 Binary files a/bridge-ui/public/fonts/AtypText-Bold.woff2 and /dev/null differ diff --git a/bridge-ui/public/fonts/AtypText-BoldItalic.woff2 b/bridge-ui/public/fonts/AtypText-BoldItalic.woff2 deleted file mode 100644 index c45f6f40..00000000 Binary files a/bridge-ui/public/fonts/AtypText-BoldItalic.woff2 and /dev/null differ diff --git a/bridge-ui/public/fonts/AtypText-Italic-subset.woff2 b/bridge-ui/public/fonts/AtypText-Italic-subset.woff2 deleted file mode 100644 index 710d4863..00000000 Binary files a/bridge-ui/public/fonts/AtypText-Italic-subset.woff2 and /dev/null differ diff --git a/bridge-ui/public/fonts/AtypText-Italic.woff2 b/bridge-ui/public/fonts/AtypText-Italic.woff2 deleted file mode 100644 index f653e448..00000000 Binary files a/bridge-ui/public/fonts/AtypText-Italic.woff2 and /dev/null differ diff --git a/bridge-ui/public/fonts/AtypText-Light-subset.woff2 b/bridge-ui/public/fonts/AtypText-Light-subset.woff2 deleted file mode 100644 index 9fc09ac2..00000000 Binary files a/bridge-ui/public/fonts/AtypText-Light-subset.woff2 and /dev/null differ diff --git a/bridge-ui/public/fonts/AtypText-Light.woff2 b/bridge-ui/public/fonts/AtypText-Light.woff2 deleted file mode 100644 index e1bce8ee..00000000 Binary files a/bridge-ui/public/fonts/AtypText-Light.woff2 and /dev/null differ diff --git a/bridge-ui/public/fonts/AtypText-LightItalic.woff2 b/bridge-ui/public/fonts/AtypText-LightItalic.woff2 deleted file mode 100644 index 92d77221..00000000 Binary files a/bridge-ui/public/fonts/AtypText-LightItalic.woff2 and /dev/null differ diff --git a/bridge-ui/public/fonts/AtypText-Medium-subset.woff2 b/bridge-ui/public/fonts/AtypText-Medium-subset.woff2 index de6c694d..34b41907 100644 Binary files a/bridge-ui/public/fonts/AtypText-Medium-subset.woff2 and b/bridge-ui/public/fonts/AtypText-Medium-subset.woff2 differ diff --git a/bridge-ui/public/fonts/AtypText-Medium.woff2 b/bridge-ui/public/fonts/AtypText-Medium.woff2 deleted file mode 100644 index 91ea908d..00000000 Binary files a/bridge-ui/public/fonts/AtypText-Medium.woff2 and /dev/null differ diff --git a/bridge-ui/public/fonts/AtypText-MediumItalic.woff2 b/bridge-ui/public/fonts/AtypText-MediumItalic.woff2 deleted file mode 100644 index 3a0108e7..00000000 Binary files a/bridge-ui/public/fonts/AtypText-MediumItalic.woff2 and /dev/null differ diff --git a/bridge-ui/public/fonts/AtypText-Regular-subset.woff2 b/bridge-ui/public/fonts/AtypText-Regular-subset.woff2 index 607bbbee..a0bc1c9a 100644 Binary files a/bridge-ui/public/fonts/AtypText-Regular-subset.woff2 and b/bridge-ui/public/fonts/AtypText-Regular-subset.woff2 differ diff --git a/bridge-ui/public/fonts/AtypText-Regular.woff2 b/bridge-ui/public/fonts/AtypText-Regular.woff2 deleted file mode 100644 index cca7fba2..00000000 Binary files a/bridge-ui/public/fonts/AtypText-Regular.woff2 and /dev/null differ diff --git a/bridge-ui/public/fonts/AtypText-Semibold-subset.woff2 b/bridge-ui/public/fonts/AtypText-Semibold-subset.woff2 index 40408302..6b61e4f2 100644 Binary files a/bridge-ui/public/fonts/AtypText-Semibold-subset.woff2 and b/bridge-ui/public/fonts/AtypText-Semibold-subset.woff2 differ diff --git a/bridge-ui/public/fonts/AtypText-Semibold.woff2 b/bridge-ui/public/fonts/AtypText-Semibold.woff2 deleted file mode 100644 index 391c77c4..00000000 Binary files a/bridge-ui/public/fonts/AtypText-Semibold.woff2 and /dev/null differ diff --git a/bridge-ui/public/fonts/AtypText-SemiboldItalic.woff2 b/bridge-ui/public/fonts/AtypText-SemiboldItalic.woff2 deleted file mode 100644 index 36c56b2f..00000000 Binary files a/bridge-ui/public/fonts/AtypText-SemiboldItalic.woff2 and /dev/null differ diff --git a/bridge-ui/src/components/top-banner/illustration/left.svg b/bridge-ui/public/images/illustration/banner/left.svg similarity index 100% rename from bridge-ui/src/components/top-banner/illustration/left.svg rename to bridge-ui/public/images/illustration/banner/left.svg diff --git a/bridge-ui/src/components/top-banner/illustration/right.svg b/bridge-ui/public/images/illustration/banner/right.svg similarity index 100% rename from bridge-ui/src/components/top-banner/illustration/right.svg rename to bridge-ui/public/images/illustration/banner/right.svg diff --git a/bridge-ui/src/app/faq/page.tsx b/bridge-ui/src/app/faq/page.tsx index 772661f7..a90a681d 100644 --- a/bridge-ui/src/app/faq/page.tsx +++ b/bridge-ui/src/app/faq/page.tsx @@ -68,7 +68,12 @@ export default function FaqPage() {
    {faqList.map((faq, index) => ( - handleToggle(index)} /> + handleToggle(index)} + /> ))}
diff --git a/bridge-ui/src/app/layout.tsx b/bridge-ui/src/app/layout.tsx index 30f999c3..83a77ffe 100644 --- a/bridge-ui/src/app/layout.tsx +++ b/bridge-ui/src/app/layout.tsx @@ -21,11 +21,11 @@ const metadata: Metadata = { export default function RootLayout({ children }: { children: React.ReactNode }) { return ( - + {metadata.title?.toString()} - +