fix multiple signatures bug

ten-protocol · Oct 10, 2023 · 532915c · 532915c
1 parent 99c4ddf
commit 532915c
Showing 1 changed file with 12 additions and 13 deletions.
diff --git a/tools/walletextension/api/staticOG/javascript.js b/tools/walletextension/api/staticOG/javascript.js
@@ -92,7 +92,6 @@ async function addNetworkToMetaMask(ethereum, userID) {
 
 async function authenticateAccountWithObscuroGateway(ethereum, account, userID) {
     const isAuthenticated = await accountIsAuthenticated(account, userID)
-
     if (isAuthenticated) {
         return "Account is already authenticated"
     }
@@ -289,18 +288,6 @@ const initialize = async () => {
         return displayOnlyJoin()
     }
 
-    // if accounts change (user adds/removed connected accounts) we want to
-    window.ethereum.on('accountsChanged', async function (accounts) {
-        if (isValidUserIDFormat(await getUserID())) {
-            userID = await getUserID();
-            for (const account of accounts) {
-                await authenticateAccountWithObscuroGateway(ethereum, account, userID)
-                accountsTable.style.display = "block"
-                await populateAccountsTable(document, tableBody, userID)
-            }
-        }
-    });
-
     // load the current version
     await fetchAndDisplayVersion();
 
@@ -353,6 +340,18 @@ const initialize = async () => {
                 await populateAccountsTable(document, tableBody, userID)
             }
 
+            // if accounts change we want to give user chance to add them to Obscuro
+            window.ethereum.on('accountsChanged', async function (accounts) {
+                if (isValidUserIDFormat(await getUserID())) {
+                    userID = await getUserID();
+                    for (const account of accounts) {
+                        await authenticateAccountWithObscuroGateway(ethereum, account, userID)
+                        accountsTable.style.display = "block"
+                        await populateAccountsTable(document, tableBody, userID)
+                    }
+                }
+            });
+
             await displayConnectedAndJoinedSuccessfully()
         }
     })