From ab52618b571e6a4aabe237bf7654ef4e3726bc18 Mon Sep 17 00:00:00 2001
From: uncoolzero <107518216+uncoolzero@users.noreply.github.com>
Date: Tue, 15 Oct 2024 15:17:07 -0300
Subject: [PATCH 1/4] copy tweak: arbitrum -> arbitrum one

---
 .../ui/src/components/Common/MigrationMessage.tsx  |  2 +-
 projects/ui/src/constants/chaininfo.ts             |  2 +-
 projects/ui/src/pages/l1delegate.tsx               | 14 +++++++-------
 projects/ui/src/pages/l2claim.tsx                  |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/projects/ui/src/components/Common/MigrationMessage.tsx b/projects/ui/src/components/Common/MigrationMessage.tsx
index 31c50e10a..8bacf6b60 100644
--- a/projects/ui/src/components/Common/MigrationMessage.tsx
+++ b/projects/ui/src/components/Common/MigrationMessage.tsx
@@ -8,7 +8,7 @@ export default function MigrationMessage({ message }: { message?: string }) {
   return (
     <Box sx={{ textAlign: 'center' }}>
       <Typography variant="h1">
-        {message || isArbitrum ? "We're migrating!" : "We're on Arbitrum!"}
+        {message || isArbitrum ? "We're migrating!" : "We're on Arbitrum One!"}
       </Typography>
       <Typography variant="body1" textAlign="center" sx={{ display: 'inline-flex', gap: 0.5 }}>
         Please check
diff --git a/projects/ui/src/constants/chaininfo.ts b/projects/ui/src/constants/chaininfo.ts
index 5ee34b09a..0ab86c8d5 100644
--- a/projects/ui/src/constants/chaininfo.ts
+++ b/projects/ui/src/constants/chaininfo.ts
@@ -63,7 +63,7 @@ export const CHAIN_INFO: ChainInfoMap = {
     explorer: 'https://arbiscan.io',
     explorerName: 'Arbiscan',
     explorerLogoUrl: arbitrumIcon,
-    label: 'Arbitrum',
+    label: 'Arbitrum One',
     logoUrl: ethereumLogoUrl,
     nativeCurrency: { name: 'Ether', symbol: 'ETH', decimals: 18 },
     statusPage: 'https://status.arbitrum.io/',
diff --git a/projects/ui/src/pages/l1delegate.tsx b/projects/ui/src/pages/l1delegate.tsx
index 2477f0f0a..6cb0a8a2d 100644
--- a/projects/ui/src/pages/l1delegate.tsx
+++ b/projects/ui/src/pages/l1delegate.tsx
@@ -331,8 +331,8 @@ export default function L1Delegate() {
                 <Box sx={{ paddingX: 2 }}>
                     <>
                         <PageHeader
-                            title="Delegate Contract Balance for L2 Migration"
-                            description="Specify which address your want your Beanstalk assets migrated to on Arbitrum"
+                            title="Delegate Balances for L2 Migration"
+                            description="Specify which address your want your Beanstalk assets migrated to on Arbitrum One"
                         />
                         <Card sx={{ padding: 1, maxWidth: 700, minWidth: 300, marginTop: 2 }}>
                             <Typography variant="h4" fontWeight={FontWeight.bold} padding={1}>
@@ -356,7 +356,7 @@ export default function L1Delegate() {
                                     fontWeight={600}
                                     sx={{ alignSelf: 'center' }}
                                 >
-                                    Arbitrum
+                                    Arbitrum One
                                 </Typography>
                                 <Typography>{ }</Typography>
                             </Box>
@@ -367,12 +367,12 @@ export default function L1Delegate() {
                                     </Typography>
                                     {(beanComplete) &&
                                         <Typography padding={1}>
-                                            The specified account will automatically be credited with Circulating Beans once Migration data clears the Arbitrum bridge.
+                                            The specified account will automatically be credited with Circulating Beans once Migration data clears the Arbitrum One bridge.
                                         </Typography>
                                     }
                                     {(migrateInternal && internalComplete) &&
                                         <Typography padding={1}>
-                                            Smart Contracts must claim their Beanstalk assets on Arbitrum in order to complete the Migration process. Click the button below to continue.
+                                            Smart Contracts must claim their Beanstalk assets on Arbitrum One in order to complete the Migration process. Click the button below to continue.
                                         </Typography>
                                     }
                                 </>
@@ -435,7 +435,7 @@ export default function L1Delegate() {
                                                 <Box sx={{ display: 'flex', flexDirection: 'column', width: '100%', justifyContent: 'flex-end' }}>
                                                     <Typography sx={{ padding: 1, color: 'GrayText' }}>
                                                         Beans held in your wallet will be
-                                                        migrated and automatically sent to the specified address on Arbitrum.
+                                                        migrated and automatically sent to the specified address on Arbitrum One.
                                                     </Typography>
                                                     <Button
                                                         disabled={!isAddressValid || (!isAddressValid && beanBalance.eq(0)) || !destinationAccount || beanComplete}
@@ -452,7 +452,7 @@ export default function L1Delegate() {
                                                 <Box sx={{ display: 'flex', flexDirection: 'column', width: '100%', justifyContent: 'flex-end' }}>
                                                     <Typography sx={{ padding: 1, color: 'GrayText' }}>
                                                         Beanstalk balances associated with this contract address will be
-                                                        migrated and available to receive on Arbitrum at the address
+                                                        migrated and available to receive on Arbitrum One at the address
                                                         specified.
                                                     </Typography>
                                                     <Button
diff --git a/projects/ui/src/pages/l2claim.tsx b/projects/ui/src/pages/l2claim.tsx
index 38b579c49..a0960ec6b 100644
--- a/projects/ui/src/pages/l2claim.tsx
+++ b/projects/ui/src/pages/l2claim.tsx
@@ -283,7 +283,7 @@ export default function L2Claim() {
                                     <Typography>{hasFert ? 'Fertilizer' : 'No Fertilizer'}</Typography>
                                 </Box>
                                 <Typography sx={{ padding: 1 }}>
-                                    This page will periodically check Arbitrum for the arrival of migration data. The button below will automatically
+                                    This page will periodically check Arbitrum One for the arrival of migration data. The button below will automatically
                                     enable itself when this data becomes available.
                                 </Typography>
                                 <Button
@@ -300,7 +300,7 @@ export default function L2Claim() {
                                     onClick={() => (!isArbitrum && !isTestnet) ? switchChain({ chainId: 42161 }) : onSubmit()}
                                 >
                                     {(!isArbitrum && !isTestnet) ?
-                                        'Switch to Arbitrum'
+                                        'Switch to Arbitrum One'
                                         : !receiverApproved ?
                                             <Box sx={{ display: 'inline-flex', gap: 1, alignContent: 'center' }}>
                                                 <BeanProgressIcon

From ad5f1c0ad4c8189be9f7e65d203f38042e2d6b7a Mon Sep 17 00:00:00 2001
From: uncoolzero <107518216+uncoolzero@users.noreply.github.com>
Date: Tue, 15 Oct 2024 16:54:23 -0300
Subject: [PATCH 2/4] auto-fill address if connected wallet is an EOA

---
 projects/ui/src/hooks/chain/useIsSmartContract.ts | 2 +-
 projects/ui/src/pages/l1delegate.tsx              | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/projects/ui/src/hooks/chain/useIsSmartContract.ts b/projects/ui/src/hooks/chain/useIsSmartContract.ts
index 0bc350fda..b98091f5f 100644
--- a/projects/ui/src/hooks/chain/useIsSmartContract.ts
+++ b/projects/ui/src/hooks/chain/useIsSmartContract.ts
@@ -19,7 +19,7 @@ export default function useIsSmartContract() {
             } else {
                 setIsLoading(true);
                 const _isContract = await getBytecode(client, { address: account as `0x${string}` })
-                if (_isContract === "0x") {
+                if (_isContract === "0x" || !_isContract) {
                     setIsContract(false);
                 } else {
                     setIsContract(true);
diff --git a/projects/ui/src/pages/l1delegate.tsx b/projects/ui/src/pages/l1delegate.tsx
index 6cb0a8a2d..0757478e6 100644
--- a/projects/ui/src/pages/l1delegate.tsx
+++ b/projects/ui/src/pages/l1delegate.tsx
@@ -211,6 +211,14 @@ export default function L1Delegate() {
         };
     }, [l1ReadResults])
 
+    useEffect(() => {
+        if (!isContract && account) {
+            checkAddress(account)
+        } else {
+            checkAddress("")
+        }
+    }, [isContract, account])
+
     useEffect(() => {
         getMigrationData();
     }, [account, sdk]);

From 4adc56b28f655c738380f34d354ba59ddfdad09b Mon Sep 17 00:00:00 2001
From: uncoolzero <107518216+uncoolzero@users.noreply.github.com>
Date: Tue, 15 Oct 2024 17:08:36 -0300
Subject: [PATCH 3/4] link to l2claim on navbar

---
 projects/ui/src/components/Nav/routes.ts | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/projects/ui/src/components/Nav/routes.ts b/projects/ui/src/components/Nav/routes.ts
index 1ddd4e17c..e58b289bb 100644
--- a/projects/ui/src/components/Nav/routes.ts
+++ b/projects/ui/src/components/Nav/routes.ts
@@ -11,6 +11,7 @@ import disclosuresIcon from '~/img/beanstalk/interface/nav/disclosures.svg';
 import analyticsIcon from '~/img/beanstalk/interface/nav/stats.svg';
 import basinIcon from '~/img/beanstalk/interface/nav/basin.svg';
 import pipelineIcon from '~/img/beanstalk/interface/nav/pipeline.svg';
+import migrationIcon from '~/img/beanstalk/interface/nav/migration.svg';
 
 export type RouteData = {
   /** Nav item title */
@@ -83,12 +84,12 @@ const ROUTES: { [key in RouteKeys]: RouteData[] } = {
       icon: governanceIcon,
       small: true,
     },
-    // {
-    //   path: '/preview',
-    //   title: 'Migration Preview',
-    //   icon: migrationIcon,
-    //   small: true,
-    // },
+    {
+      path: '/l2claim',
+      title: 'Claim Balances on L2',
+      icon: migrationIcon,
+      small: true,
+    },
     {
       path: 'docs',
       href: 'https://docs.bean.money/almanac',

From 06cc9470b1f576f411fc1eda46da744a7946f066 Mon Sep 17 00:00:00 2001
From: uncoolzero <107518216+uncoolzero@users.noreply.github.com>
Date: Tue, 15 Oct 2024 17:31:22 -0300
Subject: [PATCH 4/4] add link to claim page

---
 projects/ui/src/pages/l1delegate.tsx | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/projects/ui/src/pages/l1delegate.tsx b/projects/ui/src/pages/l1delegate.tsx
index 0757478e6..d22dfe221 100644
--- a/projects/ui/src/pages/l1delegate.tsx
+++ b/projects/ui/src/pages/l1delegate.tsx
@@ -4,6 +4,7 @@ import {
     Button,
     Card,
     InputAdornment,
+    Link,
     TextField,
     Typography,
 } from '@mui/material';
@@ -342,6 +343,18 @@ export default function L1Delegate() {
                             title="Delegate Balances for L2 Migration"
                             description="Specify which address your want your Beanstalk assets migrated to on Arbitrum One"
                         />
+                        {isContract &&
+                            <Link
+                                color="primary"
+                                display="flex"
+                                flexDirection="row"
+                                gap={1}
+                                alignItems="center"
+                                href={'#/l2claim'}
+                            >
+                                <Typography variant="subtitle1">Done with this step? Click here to Claim your assets on Arbitrum One →</Typography>
+                            </Link>
+                        }
                         <Card sx={{ padding: 1, maxWidth: 700, minWidth: 300, marginTop: 2 }}>
                             <Typography variant="h4" fontWeight={FontWeight.bold} padding={1}>
                                 Delegate Balances