Merge remote-tracking branch 'origin/manual-workflows' into manual-wo…

…rkflows
Consensys · Sep 18, 2024 · 5a789b9 · 5a789b9
2 parents 5ccad2c + e368e34
commit 5a789b9
Show file tree

Hide file tree

Showing 102 changed files with 549 additions and 434 deletions.
diff --git a/.github/workflows/bridge-ui-e2e-tests.yml b/.github/workflows/bridge-ui-e2e-tests.yml
@@ -14,7 +14,7 @@ on:
 
 jobs:
   run-e2e-tests:
-    runs-on: ubuntu-22.04-16core
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/bridge-ui/.env.production b/bridge-ui/.env.production
@@ -26,4 +26,4 @@ NEXT_PUBLIC_INFURA_ID=<GITHUB_SECRET>
 
 E2E_TEST_PRIVATE_KEY=<GITHUB_SECRET>
 
-NEXT_PUBLIC_STORAGE_MIN_VERSION="0.6.5"
+NEXT_PUBLIC_STORAGE_MIN_VERSION="1"
diff --git a/bridge-ui/README.md b/bridge-ui/README.md
@@ -154,21 +154,21 @@ The config variables are:
 | NEXT_PUBLIC_MAINNET_PROFIT_MARGIN             | Linea profit margin on mainnet                 | 2                                                                                                         |
 | NEXT_PUBLIC_MAINNET_TOKEN_LIST                | Linea Token list on mainnet                    | https://raw.githubusercontent.com/Consensys/linea-token-list/main/json/linea-mainnet-token-shortlist.json |
 |                                               |                                                |                                                                                                           |
-| NEXT_PUBLIC_SEPOLIA_L1_TOKEN_BRIDGE            | Linea Token Bridge on Ethereum Sepolia        | 0x5A0a48389BB0f12E5e017116c1105da97E129142                                                                |
-| NEXT_PUBLIC_SEPOLIA_LINEA_TOKEN_BRIDGE         | Linea Token Bridge on Linea Sepolia           | 0x93DcAdf238932e6e6a85852caC89cBd71798F463                                                                |
-| NEXT_PUBLIC_SEPOLIA_L1_MESSAGE_SERVICE         | Linea Message Service on Ethereum Sepolia     | 0xB218f8A4Bc926cF1cA7b3423c154a0D627Bdb7E5                                                                |
-| NEXT_PUBLIC_SEPOLIA_LINEA_MESSAGE_SERVICE      | Linea Message Service on Linea Sepolia        | 0x971e727e956690b9957be6d51Ec16E73AcAC83A7                                                                |
-| NEXT_PUBLIC_SEPOLIA_L1_USDC_BRIDGE             | Linea USDC Bridge on Ethereum Sepolia         | 0x32D123756d32d3eD6580935f8edF416e57b940f4                                                                |
-| NEXT_PUBLIC_SEPOLIA_LINEA_USDC_BRIDGE          | Linea USDC Bridge on Linea Sepolia            | 0xDFa112375c9be9D124932b1d104b73f888655329                                                                |
-| NEXT_PUBLIC_SEPOLIA_GAS_ESTIMATED              | Linea gas estimated on Sepolia                | 6100000000                                                                                                |
-| NEXT_PUBLIC_SEPOLIA_DEFAULT_GAS_LIMIT_SURPLUS  | Linea gas limit surplus on Sepolia            | 6000                                                                                                      |
-| NEXT_PUBLIC_SEPOLIA_PROFIT_MARGIN              | Linea profit margin on Sepolia                | 2                                                                                                         |
-| NEXT_PUBLIC_SEPOLIA_TOKEN_LIST                 | Linea Token list on Sepolia                   | https://raw.githubusercontent.com/Consensys/linea-token-list/main/json/linea-sepolia-token-shortlist.json  |
+| NEXT_PUBLIC_SEPOLIA_L1_TOKEN_BRIDGE           | Linea Token Bridge on Ethereum Sepolia         | 0x5A0a48389BB0f12E5e017116c1105da97E129142                                                                |
+| NEXT_PUBLIC_SEPOLIA_LINEA_TOKEN_BRIDGE        | Linea Token Bridge on Linea Sepolia            | 0x93DcAdf238932e6e6a85852caC89cBd71798F463                                                                |
+| NEXT_PUBLIC_SEPOLIA_L1_MESSAGE_SERVICE        | Linea Message Service on Ethereum Sepolia      | 0xB218f8A4Bc926cF1cA7b3423c154a0D627Bdb7E5                                                                |
+| NEXT_PUBLIC_SEPOLIA_LINEA_MESSAGE_SERVICE     | Linea Message Service on Linea Sepolia         | 0x971e727e956690b9957be6d51Ec16E73AcAC83A7                                                                |
+| NEXT_PUBLIC_SEPOLIA_L1_USDC_BRIDGE            | Linea USDC Bridge on Ethereum Sepolia          | 0x32D123756d32d3eD6580935f8edF416e57b940f4                                                                |
+| NEXT_PUBLIC_SEPOLIA_LINEA_USDC_BRIDGE         | Linea USDC Bridge on Linea Sepolia             | 0xDFa112375c9be9D124932b1d104b73f888655329                                                                |
+| NEXT_PUBLIC_SEPOLIA_GAS_ESTIMATED             | Linea gas estimated on Sepolia                 | 6100000000                                                                                                |
+| NEXT_PUBLIC_SEPOLIA_DEFAULT_GAS_LIMIT_SURPLUS | Linea gas limit surplus on Sepolia             | 6000                                                                                                      |
+| NEXT_PUBLIC_SEPOLIA_PROFIT_MARGIN             | Linea profit margin on Sepolia                 | 2                                                                                                         |
+| NEXT_PUBLIC_SEPOLIA_TOKEN_LIST                | Linea Token list on Sepolia                    | https://raw.githubusercontent.com/Consensys/linea-token-list/main/json/linea-sepolia-token-shortlist.json |
 |                                               |                                                |                                                                                                           |
 | NEXT_PUBLIC_WALLET_CONNECT_ID                 | Wallet Connect Api Key                         |                                                                                                           |
 | NEXT_PUBLIC_INFURA_ID                         | Infura API Key                                 |                                                                                                           |
 | E2E_TEST_PRIVATE_KEY                          | Private key to execute e2e on Sepolia          |                                                                                                           |
-| NEXT_PUBLIC_STORAGE_MIN_VERSION               | Local storage version for reseting the storage | 0.4.14                                                                                                    |
+| NEXT_PUBLIC_STORAGE_MIN_VERSION               | Local storage version for reseting the storage | 1                                                                                                         |
 
 ## About
 

diff --git a/bridge-ui/RELEASE-NOTES.md b/bridge-ui/RELEASE-NOTES.md
@@ -1,3 +1,15 @@
+<a name="v1.0.0"></a>
+
+# [v1.0.0] - 18 Sep 2024
+
+# Fix: New Bridge UI design
+
+Description:
+- New bridge UI design
+
+[Changes][v1.0.0]
+
+
 <a name="v0.6.5"></a>
 
 # [v0.6.5] - 30 May 2024

diff --git a/bridge-ui/package.json b/bridge-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bridge-ui",
-  "version": "0.6.5",
+  "version": "1.0.0",
   "private": true,
   "type": "module",
   "scripts": {

diff --git a/bridge-ui/public/fonts/AtypDisplay-Bold-subset.woff2 b/bridge-ui/public/fonts/AtypDisplay-Bold-subset.woff2
diff --git a/...c/app/assets/fonts/AtypDisplay-Bold.woff2 → ...ge-ui/public/fonts/AtypDisplay-Bold.woff2 b/...c/app/assets/fonts/AtypDisplay-Bold.woff2 → ...ge-ui/public/fonts/AtypDisplay-Bold.woff2
diff --git a/...assets/fonts/AtypDisplay-BoldItalic.woff2 → ...public/fonts/AtypDisplay-BoldItalic.woff2 b/...assets/fonts/AtypDisplay-BoldItalic.woff2 → ...public/fonts/AtypDisplay-BoldItalic.woff2
diff --git a/...app/assets/fonts/AtypDisplay-Italic.woff2 → ...-ui/public/fonts/AtypDisplay-Italic.woff2 b/...app/assets/fonts/AtypDisplay-Italic.woff2 → ...-ui/public/fonts/AtypDisplay-Italic.woff2
diff --git a/bridge-ui/public/fonts/AtypDisplay-Light-subset.woff2 b/bridge-ui/public/fonts/AtypDisplay-Light-subset.woff2
diff --git a/.../app/assets/fonts/AtypDisplay-Light.woff2 → ...e-ui/public/fonts/AtypDisplay-Light.woff2 b/.../app/assets/fonts/AtypDisplay-Light.woff2 → ...e-ui/public/fonts/AtypDisplay-Light.woff2
diff --git a/...ssets/fonts/AtypDisplay-LightItalic.woff2 → ...ublic/fonts/AtypDisplay-LightItalic.woff2 b/...ssets/fonts/AtypDisplay-LightItalic.woff2 → ...ublic/fonts/AtypDisplay-LightItalic.woff2
diff --git a/bridge-ui/public/fonts/AtypDisplay-Medium-subset.woff2 b/bridge-ui/public/fonts/AtypDisplay-Medium-subset.woff2
diff --git a/...app/assets/fonts/AtypDisplay-Medium.woff2 → ...-ui/public/fonts/AtypDisplay-Medium.woff2 b/...app/assets/fonts/AtypDisplay-Medium.woff2 → ...-ui/public/fonts/AtypDisplay-Medium.woff2
diff --git a/...sets/fonts/AtypDisplay-MediumItalic.woff2 → ...blic/fonts/AtypDisplay-MediumItalic.woff2 b/...sets/fonts/AtypDisplay-MediumItalic.woff2 → ...blic/fonts/AtypDisplay-MediumItalic.woff2
diff --git a/bridge-ui/public/fonts/AtypDisplay-Regular-subset.woff2 b/bridge-ui/public/fonts/AtypDisplay-Regular-subset.woff2
diff --git a/...pp/assets/fonts/AtypDisplay-Regular.woff2 → ...ui/public/fonts/AtypDisplay-Regular.woff2 b/...pp/assets/fonts/AtypDisplay-Regular.woff2 → ...ui/public/fonts/AtypDisplay-Regular.woff2
diff --git a/bridge-ui/public/fonts/AtypDisplay-Semibold-subset.woff2 b/bridge-ui/public/fonts/AtypDisplay-Semibold-subset.woff2
diff --git a/...p/assets/fonts/AtypDisplay-Semibold.woff2 → ...i/public/fonts/AtypDisplay-Semibold.woff2 b/...p/assets/fonts/AtypDisplay-Semibold.woff2 → ...i/public/fonts/AtypDisplay-Semibold.woff2
diff --git a/...ts/fonts/AtypDisplay-SemiboldItalic.woff2 → ...ic/fonts/AtypDisplay-SemiboldItalic.woff2 b/...ts/fonts/AtypDisplay-SemiboldItalic.woff2 → ...ic/fonts/AtypDisplay-SemiboldItalic.woff2
diff --git a/bridge-ui/public/fonts/AtypText-Bold-subset.woff2 b/bridge-ui/public/fonts/AtypText-Bold-subset.woff2
diff --git a/.../src/app/assets/fonts/AtypText-Bold.woff2 → bridge-ui/public/fonts/AtypText-Bold.woff2 b/.../src/app/assets/fonts/AtypText-Bold.woff2 → bridge-ui/public/fonts/AtypText-Bold.woff2
diff --git a/...pp/assets/fonts/AtypText-BoldItalic.woff2 → ...ui/public/fonts/AtypText-BoldItalic.woff2 b/...pp/assets/fonts/AtypText-BoldItalic.woff2 → ...ui/public/fonts/AtypText-BoldItalic.woff2
diff --git a/bridge-ui/public/fonts/AtypText-Italic-subset.woff2 b/bridge-ui/public/fonts/AtypText-Italic-subset.woff2
diff --git a/...rc/app/assets/fonts/AtypText-Italic.woff2 → bridge-ui/public/fonts/AtypText-Italic.woff2 b/...rc/app/assets/fonts/AtypText-Italic.woff2 → bridge-ui/public/fonts/AtypText-Italic.woff2
diff --git a/bridge-ui/public/fonts/AtypText-Light-subset.woff2 b/bridge-ui/public/fonts/AtypText-Light-subset.woff2
diff --git a/...src/app/assets/fonts/AtypText-Light.woff2 → bridge-ui/public/fonts/AtypText-Light.woff2 b/...src/app/assets/fonts/AtypText-Light.woff2 → bridge-ui/public/fonts/AtypText-Light.woff2
diff --git a/...p/assets/fonts/AtypText-LightItalic.woff2 → ...i/public/fonts/AtypText-LightItalic.woff2 b/...p/assets/fonts/AtypText-LightItalic.woff2 → ...i/public/fonts/AtypText-LightItalic.woff2
diff --git a/bridge-ui/public/fonts/AtypText-Medium-subset.woff2 b/bridge-ui/public/fonts/AtypText-Medium-subset.woff2
diff --git a/...rc/app/assets/fonts/AtypText-Medium.woff2 → bridge-ui/public/fonts/AtypText-Medium.woff2 b/...rc/app/assets/fonts/AtypText-Medium.woff2 → bridge-ui/public/fonts/AtypText-Medium.woff2
diff --git a/.../assets/fonts/AtypText-MediumItalic.woff2 → .../public/fonts/AtypText-MediumItalic.woff2 b/.../assets/fonts/AtypText-MediumItalic.woff2 → .../public/fonts/AtypText-MediumItalic.woff2
diff --git a/bridge-ui/public/fonts/AtypText-Regular-subset.woff2 b/bridge-ui/public/fonts/AtypText-Regular-subset.woff2
diff --git a/...c/app/assets/fonts/AtypText-Regular.woff2 → ...ge-ui/public/fonts/AtypText-Regular.woff2 b/...c/app/assets/fonts/AtypText-Regular.woff2 → ...ge-ui/public/fonts/AtypText-Regular.woff2
diff --git a/bridge-ui/public/fonts/AtypText-Semibold-subset.woff2 b/bridge-ui/public/fonts/AtypText-Semibold-subset.woff2
diff --git a/.../app/assets/fonts/AtypText-Semibold.woff2 → ...e-ui/public/fonts/AtypText-Semibold.woff2 b/.../app/assets/fonts/AtypText-Semibold.woff2 → ...e-ui/public/fonts/AtypText-Semibold.woff2
diff --git a/...ssets/fonts/AtypText-SemiboldItalic.woff2 → ...ublic/fonts/AtypText-SemiboldItalic.woff2 b/...ssets/fonts/AtypText-SemiboldItalic.woff2 → ...ublic/fonts/AtypText-SemiboldItalic.woff2
diff --git a/bridge-ui/src/app/faq/page.tsx b/bridge-ui/src/app/faq/page.tsx
@@ -1,5 +1,5 @@
 import Link from "next/link";
-import { Collapse } from "@/components/Collapse";
+import { Collapse } from "@/components/ui";
 
 export default function FaqPage() {
   return (

diff --git a/bridge-ui/src/app/font/atyp.ts b/bridge-ui/src/app/font/atyp.ts
diff --git a/bridge-ui/src/app/font/atypText.ts b/bridge-ui/src/app/font/atypText.ts
diff --git a/bridge-ui/src/app/layout.tsx b/bridge-ui/src/app/layout.tsx
@@ -2,17 +2,17 @@ import { Metadata } from "next";
 import { headers } from "next/headers";
 import Script from "next/script";
 import { cookieToInitialState } from "wagmi";
-import { Inter } from "next/font/google";
 import { wagmiConfig } from "@/config";
 import usabillaBeScript from "@/scripts/usabilla";
 import { gtmScript, gtmNoScript } from "@/scripts/gtm";
 import { Providers } from "@/components/layouts/Providers";
 import { Layout } from "@/components/layouts/Layout";
+import { cn } from "@/utils/cn";
+import atypFont from "@/assets/fonts/atyp";
+import atypTextFont from "@/assets/fonts/atypText";
 import "react-toastify/dist/ReactToastify.css";
 import "./globals.css";
 
-const inter = Inter({ subsets: ["latin"] });
-
 const metadata: Metadata = {
   title: "Linea Bridge",
   description: `Linea Bridge is a bridge solution, providing secure and efficient cross-chain transactions between Layer 1 and Linea networks.
@@ -30,7 +30,7 @@ export default function RootLayout({ children }: { children: React.ReactNode })
       <title>{metadata.title?.toString()}</title>
       <meta name="description" content={metadata.description?.toString()} key="desc" />
 
-      <body className={inter.className}>
+      <body className={cn(atypFont.variable, atypTextFont.variable, atypFont.className, atypTextFont.className)}>
         <noscript dangerouslySetInnerHTML={{ __html: gtmNoScript }} />
 
         <Providers initialState={initialState}>

diff --git a/bridge-ui/src/assets/fonts/atyp.ts b/bridge-ui/src/assets/fonts/atyp.ts
@@ -0,0 +1,85 @@
+import localFont from "next/font/local";
+
+const atypFont = localFont({
+  display: "swap",
+  src: [
+    {
+      path: "../../../public/fonts/AtypDisplay-Light-subset.woff2",
+      weight: "300",
+      style: "normal",
+    },
+    {
+      path: "../../../public/fonts/AtypDisplay-Light.woff2",
+      weight: "300",
+      style: "normal",
+    },
+    {
+      path: "../../../public/fonts/AtypDisplay-LightItalic.woff2",
+      weight: "300",
+      style: "italic",
+    },
+    {
+      path: "../../../public/fonts/AtypDisplay-Regular-subset.woff2",
+      weight: "400",
+      style: "normal",
+    },
+    {
+      path: "../../../public/fonts/AtypDisplay-Regular.woff2",
+      weight: "400",
+      style: "normal",
+    },
+    {
+      path: "../../../public/fonts/AtypDisplay-Italic.woff2",
+      weight: "400",
+      style: "italic",
+    },
+    {
+      path: "../../../public/fonts/AtypDisplay-Medium-subset.woff2",
+      weight: "500",
+      style: "normal",
+    },
+    {
+      path: "../../../public/fonts/AtypDisplay-Medium.woff2",
+      weight: "500",
+      style: "normal",
+    },
+    {
+      path: "../../../public/fonts/AtypDisplay-MediumItalic.woff2",
+      weight: "500",
+      style: "italic",
+    },
+    {
+      path: "../../../public/fonts/AtypDisplay-Semibold-subset.woff2",
+      weight: "600",
+      style: "normal",
+    },
+    {
+      path: "../../../public/fonts/AtypDisplay-Semibold.woff2",
+      weight: "600",
+      style: "normal",
+    },
+    {
+      path: "../../../public/fonts/AtypDisplay-SemiboldItalic.woff2",
+      weight: "600",
+      style: "italic",
+    },
+    {
+      path: "../../../public/fonts/AtypDisplay-Bold-subset.woff2",
+      weight: "700",
+      style: "normal",
+    },
+    {
+      path: "../../../public/fonts/AtypDisplay-Bold.woff2",
+      weight: "700",
+      style: "normal",
+    },
+    {
+      path: "../../../public/fonts/AtypDisplay-BoldItalic.woff2",
+      weight: "700",
+      style: "italic",
+    },
+  ],
+  variable: "--font-atyp",
+});
+
+export default atypFont;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -26,4 +26,4 @@ NEXT_PUBLIC_INFURA_ID=<GITHUB_SECRET>

		E2E_TEST_PRIVATE_KEY=<GITHUB_SECRET>

		NEXT_PUBLIC_STORAGE_MIN_VERSION="0.6.5"
		NEXT_PUBLIC_STORAGE_MIN_VERSION="1"