DAC-290 Testnet/Mainnet value correction

input-output-hk · Jan 31, 2023 · 5c5bbce · 5c5bbce
1 parent b397eab
commit 5c5bbce
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/react-web/src/app/App.tsx b/react-web/src/app/App.tsx
@@ -24,9 +24,8 @@ const PageLayout = () => {
   const { network } = useAppSelector((state) => state.auth);
 
   const networkNames:{[x:string]:string} = {
-    '0': 'Mainnet',
-    '1': 'Testnet',
-    '2': 'Preprod'
+    '0': 'Testnet',
+    '1': 'Mainnet'
   }
 
   const Banner = memo(() => {
@@ -35,7 +34,7 @@ const PageLayout = () => {
     return (<>
       {network !== null && network !== 1 ? 
         <Alert severity="info" style={{marginBottom: '10px'}}>Your connected wallet is not in Mainnet.</Alert> : null}
-      {network !== null && network?.toString() !== networkEnvVar ? 
+      {network !== null && network === 1 && network?.toString() !== networkEnvVar ? 
         <Alert severity="warning">Please make sure you are connected to wallet in {networkNames[networkEnvVar]}.</Alert> : null}
     </>)
   })

diff --git a/react-web/src/components/Header/Header.tsx b/react-web/src/components/Header/Header.tsx
@@ -73,10 +73,12 @@ const Header = () => {
     async() => {
       setPollForNetwork(false)
       wallet.getNetworkId().then((id: number) => {
+        // Preview/Preprod/Testnet are all 0. Switching among them cannot be distinguished.
+        // But, switching to-and-fro Mainnet is triggered
         if (id !== network) {
           forceUserLogout();
         } else {
-          setPollForNetwork(false)
+          setPollForNetwork(true)
         }
       })
     },