From 459896889c5af95f6417ceb4d5ffcc1d4c975270 Mon Sep 17 00:00:00 2001
From: Felipe Mendes <zo.fmendes@gmail.com>
Date: Wed, 18 Sep 2024 14:48:09 -0300
Subject: [PATCH] chore: allow laboratory solana tests on mainnet (#2863)

---
 .../Solana/SolanaSendTransactionTest.tsx           | 14 ++------------
 .../Solana/SolanaSignAllTransactionsTest.tsx       | 14 ++------------
 .../Solana/SolanaSignAndSendTransactionTest.tsx    | 14 ++------------
 .../Solana/SolanaSignJupiterSwapTest.tsx           | 14 ++------------
 .../Solana/SolanaSignTransactionTest.tsx           | 14 ++------------
 .../src/components/Solana/SolanaTests.tsx          |  5 +++--
 6 files changed, 13 insertions(+), 62 deletions(-)

diff --git a/apps/laboratory/src/components/Solana/SolanaSendTransactionTest.tsx b/apps/laboratory/src/components/Solana/SolanaSendTransactionTest.tsx
index 898e60c6ed..514847980e 100644
--- a/apps/laboratory/src/components/Solana/SolanaSendTransactionTest.tsx
+++ b/apps/laboratory/src/components/Solana/SolanaSendTransactionTest.tsx
@@ -1,6 +1,6 @@
 import { useState } from 'react'
-import { Button, Stack, Text, Spacer, Link } from '@chakra-ui/react'
-import { useAppKitAccount, useAppKitNetwork, useAppKitProvider } from '@reown/appkit/react'
+import { Button, Stack, Spacer, Link } from '@chakra-ui/react'
+import { useAppKitAccount, useAppKitProvider } from '@reown/appkit/react'
 import {
   PublicKey,
   Transaction,
@@ -9,7 +9,6 @@ import {
   SystemProgram
 } from '@solana/web3.js'
 
-import { solana } from '@reown/appkit/networks'
 import { useChakraToast } from '../Toast'
 import { type Provider, useAppKitConnection } from '@reown/appkit-adapter-solana/react'
 
@@ -20,7 +19,6 @@ const amountInLamports = 10_000_000
 export function SolanaSendTransactionTest() {
   const toast = useChakraToast()
   const { address } = useAppKitAccount()
-  const { caipNetwork } = useAppKitNetwork()
   const { walletProvider } = useAppKitProvider<Provider>('solana')
   const { connection } = useAppKitConnection()
   const [loading, setLoading] = useState(false)
@@ -131,14 +129,6 @@ export function SolanaSendTransactionTest() {
     return null
   }
 
-  if (caipNetwork?.chainId === solana.chainId) {
-    return (
-      <Text fontSize="md" color="yellow">
-        Switch to Solana Devnet or Testnet to test this feature
-      </Text>
-    )
-  }
-
   return (
     <Stack direction={['column', 'column', 'row']}>
       <Button
diff --git a/apps/laboratory/src/components/Solana/SolanaSignAllTransactionsTest.tsx b/apps/laboratory/src/components/Solana/SolanaSignAllTransactionsTest.tsx
index 5400478c28..329931b790 100644
--- a/apps/laboratory/src/components/Solana/SolanaSignAllTransactionsTest.tsx
+++ b/apps/laboratory/src/components/Solana/SolanaSignAllTransactionsTest.tsx
@@ -1,5 +1,5 @@
 import { useState } from 'react'
-import { Button, Stack, Text, Spacer } from '@chakra-ui/react'
+import { Button, Stack, Spacer } from '@chakra-ui/react'
 import {
   PublicKey,
   Transaction,
@@ -10,9 +10,8 @@ import {
 } from '@solana/web3.js'
 
 import { type Provider, useAppKitConnection } from '@reown/appkit-adapter-solana/react'
-import { useAppKitNetwork, useAppKitProvider } from '@reown/appkit/react'
+import { useAppKitProvider } from '@reown/appkit/react'
 
-import { solana } from '@reown/appkit/networks'
 import { useChakraToast } from '../Toast'
 import bs58 from 'bs58'
 
@@ -22,7 +21,6 @@ const amountInLamports = 1_000_000
 
 export function SolanaSignAllTransactionsTest() {
   const toast = useChakraToast()
-  const { chainId } = useAppKitNetwork()
   const { walletProvider } = useAppKitProvider<Provider>('solana')
   const { connection } = useAppKitConnection()
   const [loading, setLoading] = useState(false)
@@ -74,14 +72,6 @@ export function SolanaSignAllTransactionsTest() {
     }
   }
 
-  if (chainId === solana.chainId) {
-    return (
-      <Text fontSize="md" color="yellow">
-        Switch to Solana Devnet or Testnet to test this feature
-      </Text>
-    )
-  }
-
   return (
     <Stack direction={['column', 'column', 'row']}>
       <Button
diff --git a/apps/laboratory/src/components/Solana/SolanaSignAndSendTransactionTest.tsx b/apps/laboratory/src/components/Solana/SolanaSignAndSendTransactionTest.tsx
index 835d1c473a..d353b5e236 100644
--- a/apps/laboratory/src/components/Solana/SolanaSignAndSendTransactionTest.tsx
+++ b/apps/laboratory/src/components/Solana/SolanaSignAndSendTransactionTest.tsx
@@ -1,5 +1,5 @@
 import { useState } from 'react'
-import { Button, Stack, Text, Spacer, Link } from '@chakra-ui/react'
+import { Button, Stack, Spacer, Link } from '@chakra-ui/react'
 
 import {
   PublicKey,
@@ -9,9 +9,8 @@ import {
   VersionedTransaction
 } from '@solana/web3.js'
 
-import { solana } from '@reown/appkit/networks'
 import { useChakraToast } from '../Toast'
-import { useAppKitAccount, useAppKitNetwork, useAppKitProvider } from '@reown/appkit/react'
+import { useAppKitAccount, useAppKitProvider } from '@reown/appkit/react'
 import { useAppKitConnection, type Provider } from '@reown/appkit-adapter-solana/react'
 
 const PHANTOM_TESTNET_ADDRESS = '8vCyX7oB6Pc3pbWMGYYZF5pbSnAdQ7Gyr32JqxqCy8ZR'
@@ -21,7 +20,6 @@ const amountInLamports = 10_000_000
 export function SolanaSignAndSendTransaction() {
   const toast = useChakraToast()
   const { address } = useAppKitAccount()
-  const { caipNetwork } = useAppKitNetwork()
   const { walletProvider } = useAppKitProvider<Provider>('solana')
   const { connection } = useAppKitConnection()
 
@@ -92,14 +90,6 @@ export function SolanaSignAndSendTransaction() {
     return null
   }
 
-  if (caipNetwork?.chainId === solana.chainId) {
-    return (
-      <Text fontSize="md" color="yellow">
-        Switch to Solana Devnet or Testnet to test this feature
-      </Text>
-    )
-  }
-
   return (
     <Stack direction={['column', 'column', 'row']}>
       <Button
diff --git a/apps/laboratory/src/components/Solana/SolanaSignJupiterSwapTest.tsx b/apps/laboratory/src/components/Solana/SolanaSignJupiterSwapTest.tsx
index 82fc16b231..65c6e5139d 100644
--- a/apps/laboratory/src/components/Solana/SolanaSignJupiterSwapTest.tsx
+++ b/apps/laboratory/src/components/Solana/SolanaSignJupiterSwapTest.tsx
@@ -1,9 +1,8 @@
 import { useState } from 'react'
-import { Button, Stack, Text, Spacer } from '@chakra-ui/react'
+import { Button, Stack, Spacer } from '@chakra-ui/react'
 import { PublicKey, VersionedTransaction } from '@solana/web3.js'
 
-import { useAppKitNetwork, useAppKitProvider } from '@reown/appkit/react'
-import { solana } from '@reown/appkit/networks'
+import { useAppKitProvider } from '@reown/appkit/react'
 import { useChakraToast } from '../Toast'
 import bs58 from 'bs58'
 import { useAppKitConnection, type Provider } from '@reown/appkit-adapter-solana/react'
@@ -11,7 +10,6 @@ import { useAppKitConnection, type Provider } from '@reown/appkit-adapter-solana
 export function SolanaSignJupiterSwapTest() {
   const toast = useChakraToast()
   const { connection } = useAppKitConnection()
-  const { caipNetwork } = useAppKitNetwork()
   const { walletProvider } = useAppKitProvider<Provider>('solana')
   const [loading, setLoading] = useState(false)
 
@@ -52,14 +50,6 @@ export function SolanaSignJupiterSwapTest() {
     }
   }
 
-  if (caipNetwork?.chainId === solana.chainId) {
-    return (
-      <Text fontSize="md" color="yellow">
-        Switch to Solana Devnet or Testnet to test this feature
-      </Text>
-    )
-  }
-
   return (
     <Stack direction={['column', 'column', 'row']}>
       <Button
diff --git a/apps/laboratory/src/components/Solana/SolanaSignTransactionTest.tsx b/apps/laboratory/src/components/Solana/SolanaSignTransactionTest.tsx
index 3148ed5afb..8733937084 100644
--- a/apps/laboratory/src/components/Solana/SolanaSignTransactionTest.tsx
+++ b/apps/laboratory/src/components/Solana/SolanaSignTransactionTest.tsx
@@ -1,5 +1,5 @@
 import { useState } from 'react'
-import { Button, Stack, Text, Spacer } from '@chakra-ui/react'
+import { Button, Stack, Spacer } from '@chakra-ui/react'
 import {
   PublicKey,
   Transaction,
@@ -8,9 +8,8 @@ import {
   SystemProgram
 } from '@solana/web3.js'
 
-import { useAppKitNetwork, useAppKitProvider } from '@reown/appkit/react'
+import { useAppKitProvider } from '@reown/appkit/react'
 import { useAppKitConnection, type Provider } from '@reown/appkit-adapter-solana/react'
-import { solana } from '@reown/appkit/networks'
 import { useChakraToast } from '../Toast'
 import bs58 from 'bs58'
 
@@ -20,7 +19,6 @@ const amountInLamports = 10_000_000
 
 export function SolanaSignTransactionTest() {
   const toast = useChakraToast()
-  const { caipNetwork } = useAppKitNetwork()
   const { walletProvider } = useAppKitProvider<Provider>('solana')
   const { connection } = useAppKitConnection()
   const [loading, setLoading] = useState(false)
@@ -124,14 +122,6 @@ export function SolanaSignTransactionTest() {
     }
   }
 
-  if (caipNetwork?.chainId === solana.chainId) {
-    return (
-      <Text fontSize="md" color="yellow">
-        Switch to Solana Devnet or Testnet to test this feature
-      </Text>
-    )
-  }
-
   return (
     <Stack direction={['column', 'column', 'row']}>
       <Button
diff --git a/apps/laboratory/src/components/Solana/SolanaTests.tsx b/apps/laboratory/src/components/Solana/SolanaTests.tsx
index 01424b0350..83bbacec4c 100644
--- a/apps/laboratory/src/components/Solana/SolanaTests.tsx
+++ b/apps/laboratory/src/components/Solana/SolanaTests.tsx
@@ -38,10 +38,11 @@ export function SolanaTests() {
             </Heading>
             <SolanaSignMessageTest />
           </Box>
-          {caipNetwork?.chainId !== solana.chainId && (
+          {caipNetwork?.chainId === solana.chainId && (
             <Box>
               <Text fontSize="md" color="yellow">
-                Please ensure your wallet is connected to the {caipNetwork?.name}
+                Please be aware that you are connected to the mainnet. Be careful with your
+                transactions.
               </Text>
             </Box>
           )}