Merge pull request #172 from chain4travel/fix-network

fix switching to logged in network
chain4travel · Dec 29, 2023 · 6ccb8e9 · 6ccb8e9
2 parents 1748af5 + f37dcb3
commit 6ccb8e9
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 8 deletions.
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
@@ -82,12 +82,24 @@ Cypress.Commands.add('changeNetwork', (network: string = 'Kopernikus') => {
     cy.get('@txtSelectedNetwork')
         .invoke('text')
         .then(currentNetwork => {
-            cy.get('@btnNetworkSwitcher').click({ force: true }) // Network Switcher
-            cy.get(`[data-value="${network}"]`).click() // Select Network
-
-            // Waiting 'info.networkID', and 'info.getTxFee'
-            cy.wait('@getNetworkID').then(interceptNetworkInfo)
-            cy.wait('@getTxFee').then(interceptNetworkInfo)
+            if (currentNetwork !== network) {
+                // Only perform the switch if the current network is different
+                cy.get('@btnNetworkSwitcher').click({ force: true })
+                cy.get(`[data-value="${network}"]`).click()
+
+                // After switching, wait for the network requests
+                cy.wait('@getNetworkID').then(interceptNetworkInfo)
+                cy.wait('@getTxFee').then(interceptNetworkInfo)
+            } else {
+                cy.get('body').then($body => {
+                    if ($body.find(`[data-value="${network}"]`).length > 0) {
+                        cy.get(`[data-value="${network}"]`).click()
+                    } else {
+                        cy.log(`Network option '${network}' not found.`)
+                    }
+                })
+                cy.log(`Already on the '${network}' network, no switch needed.`)
+            }
 
             // increasing timeout to make sure the network is selected, especially on slowly local dev env
             cy.get('@txtSelectedNetwork', { timeout: 15000 }).should('have.text', network)

diff --git a/src/components/Navbar/NetworkSwitcher.tsx b/src/components/Navbar/NetworkSwitcher.tsx
@@ -91,8 +91,12 @@ export default function NetworkSwitcher({ handleCloseSidebar }: NetworkSwitcherP
                                 flexDirection: 'column',
                                 alignItems: 'baseline',
                                 color: theme.palette.text.primary,
+                                ...(network.name === activeNetwork.name && { cursor: 'auto' }),
+                            }}
+                            onClick={() => {
+                                if (network.name === activeNetwork.name) return
+                                changeNetwork(network.name)
                             }}
-                            onClick={() => changeNetwork(network.name)}
                         >
                             <Stack
                                 direction="row"
@@ -194,9 +198,14 @@ export default function NetworkSwitcher({ handleCloseSidebar }: NetworkSwitcherP
                             value={network.name}
                             divider
                             onClick={() => {
+                                if (network.name === activeNetwork.name) return
                                 handleChangeNetwork(network.name)
                             }}
-                            sx={{ gap: '.6rem', justifyContent: 'space-between' }}
+                            sx={{
+                                gap: '.6rem',
+                                justifyContent: 'space-between',
+                                ...(network.name === activeNetwork.name && { cursor: 'auto' }),
+                            }}
                             data-cy={`network-name-${network.name}`}
                         >
                             <Typography variant="body2" component="span" noWrap>