feat(dapp-browser)_: change account from popup

Author: friofry

src/app/core/signals/remote_signals/connector.nim

@@ -42,6 +42,11 @@ type ConnectorDAppChainIdSwitchedSignal* = ref object of Signal
   url*: string
   chainId*: string
 
+type ConnectorAccountChangedSignal* = ref object of Signal
+  url*: string
+  clientId*: string
+  sharedAccount*: string
+
 proc fromEvent*(T: type ConnectorSendRequestAccountsSignal, event: JsonNode): ConnectorSendRequestAccountsSignal =
   result = ConnectorSendRequestAccountsSignal()
   result.signalType = SignalType.ConnectorSendRequestAccounts
@@ -91,4 +96,11 @@ proc fromEvent*(T: type ConnectorDAppChainIdSwitchedSignal, event: JsonNode): Co
   result = ConnectorDAppChainIdSwitchedSignal()
   result.signalType = SignalType.ConnectorDAppChainIdSwitched
   result.url = event["event"]{"url"}.getStr()
-  result.chainId = event["event"]{"chainId"}.getStr()
+  result.chainId = event["event"]{"chainId"}.getStr()
+
+proc fromEvent*(T: type ConnectorAccountChangedSignal, event: JsonNode): ConnectorAccountChangedSignal =
+  result = ConnectorAccountChangedSignal()
+  result.signalType = SignalType.ConnectorAccountChanged
+  result.url = event["event"]{"url"}.getStr()
+  result.clientId = event["event"]{"clientId"}.getStr()
+  result.sharedAccount = event["event"]{"sharedAccount"}.getStr()

src/app/core/signals/remote_signals/signal_type.nim

@@ -75,6 +75,7 @@ type SignalType* {.pure.} = enum
   ConnectorRevokeDAppPermission = "connector.dAppPermissionRevoked"
   ConnectorSign = "connector.Sign"
   ConnectorDAppChainIdSwitched = "connector.dAppChainIdSwitched"
+  ConnectorAccountChanged = "connector.dAppAccountChanged"
   LocalMessageBackupDone = "local.message.backup.done"
   Unknown
 

src/app/core/signals/signals_manager.nim

@@ -143,6 +143,7 @@ QtObject:
       of SignalType.ConnectorRevokeDAppPermission: ConnectorRevokeDAppPermissionSignal.fromEvent(jsonSignal)
       of SignalType.ConnectorSign: ConnectorSignSignal.fromEvent(jsonSignal)
       of SignalType.ConnectorDAppChainIdSwitched: ConnectorDAppChainIdSwitchedSignal.fromEvent(jsonSignal)
+      of SignalType.ConnectorAccountChanged: ConnectorAccountChangedSignal.fromEvent(jsonSignal)
       # networks
       of SignalType.NetworksBlockchainHealthChanged: NetworksBlockchainHealthChangedSignal.fromEvent(jsonSignal)
       else:

src/app_service/service/connector/service.nim

@@ -223,6 +223,20 @@ QtObject:
     except:
       error "connectorCallRPC: starting async background task failed", requestId=requestId
 
+  proc changeAccount*(self: Service, url: string, clientId: string, newAccount: string): bool =
+    try:
+      var args = ChangeAccountArgs(
+        url: url,
+        account: newAccount,
+        clientID: clientId
+      )
+      
+      return status_go.changeAccountFinishedRpc(args)
+
+    except Exception as e:
+      error "changeAccount failed", error=e.msg
+      return false
+
   proc delete*(self: Service) =
     self.QObject.delete
 

src/backend/connector.nim

@@ -31,6 +31,11 @@ type SignAcceptedArgs* = ref object of RootObj
   requestId* {.serializedFieldName("requestId").}: string
   signature* {.serializedFieldName("signature").}: string
 
+type ChangeAccountArgs* = ref object of RootObj
+  url* {.serializedFieldName("url").}: string
+  account* {.serializedFieldName("account").}: string
+  clientID* {.serializedFieldName("clientId").}: string
+
 rpc(requestAccountsAccepted, "connector"):
   args: RequestAccountsAcceptedArgs
 
@@ -58,6 +63,9 @@ rpc(signRejected, "connector"):
 rpc(callRPC, "connector"):
   inputJSON: string
 
+rpc(changeAccount, "connector"):
+  args: ChangeAccountArgs
+
 proc isSuccessResponse(rpcResponse: RpcResponse[JsonNode]): bool =
   return rpcResponse.error.isNil
 
@@ -84,3 +92,6 @@ proc sendSignRejectedFinishedRpc*(args: RejectedArgs): bool =
 
 proc connectorCallRPC*(inputJSON: string): RpcResponse[JsonNode] {.raises: [Exception].} =
   return callRPC(inputJSON)
+
+proc changeAccountFinishedRpc*(args: ChangeAccountArgs): bool =
+  return isSuccessResponse(changeAccount(args))

ui/app/AppLayouts/Browser/BrowserLayout.qml

@@ -362,6 +362,7 @@ StatusSectionLayout {
                 y: (Math.abs(browserHeader.mapFromGlobal(headerPoint).y) +
                     browserHeader.anchors.topMargin + Theme.halfPadding)
                 onSendTriggered: (address) => root.sendToRecipientRequested(address)
+                onAccountChanged: (newAddress) => connectorBridge.manager.changeAccount(newAddress)
                 onReload: {
                     for (let i = 0; i < tabs.count; ++i){
                         tabs.getTab(i).reload();

ui/app/AppLayouts/Browser/popups/BrowserWalletMenu.qml

@@ -28,6 +28,7 @@ Dialog {
     signal sendTriggered(string address)
     signal disconnect()
     signal reload()
+    signal accountChanged(string newAddress)
 
     modal: false
 
@@ -155,6 +156,7 @@ Dialog {
 
                 accountSelectorRow.currentAddress = currentAccountAddress
                 root.browserWalletStore.switchAccountByAddress(currentAccountAddress)
+                root.accountChanged(currentAccountAddress)
                 reload()
             }
         }

ui/app/AppLayouts/Browser/provider/qml/ConnectorBridge.qml

@@ -65,7 +65,7 @@ Item {
 
         const urlStr = url.toString()
         connectorManager.dappUrl = urlStr
-        connectorManager.dappOrigin = urlStr
+        connectorManager.dappOrigin = Utils.normalizeOrigin(urlStr)
         connectorManager.dappName = name || Utils.extractDomainName(urlStr)
         connectorManager.dappChainId = 1
     }

ui/app/AppLayouts/Browser/provider/qml/ConnectorManager.qml

@@ -32,30 +32,30 @@ Item {
     signal messageEvent(var message)
     signal requestCompletedEvent(var payload)
 
-    // PUBLIC API - EIP-1193 REQUEST
-    function request(args) {
-        if (!args || !args.method) {
-            console.error("[ConnectorManager] Invalid request")
-            return JSON.stringify({
-                error: { code: -32600, message: "Missing method" }
-            })
-        }
-        
-        const method = args.method
-        const requestId = args.requestId || 0
-        
-        var rpcRequest = {
-            "jsonrpc": "2.0",
-            "id": requestId,
-            "method": method,
-            "params": args.params || [],
-            "url": dappOrigin || dappUrl || "",
-            "name": dappName || "Unknown dApp",
-            "clientId": clientId,
-            "chainId": dappChainId,
-            "iconUrl": dappIconUrl || ""
-        }
-        
+	// PUBLIC API - EIP-1193 REQUEST
+	function request(args) {
+		if (!args || !args.method) {
+			console.error("[ConnectorManager] Invalid request - missing method")
+			return JSON.stringify({
+				error: { code: -32600, message: "Missing method" }  // EIP-1193: Invalid Request
+			})
+		}
+
+		const method = args.method
+		const requestId = args.requestId || 0
+
+		var rpcRequest = {
+			"jsonrpc": "2.0",
+			"id": requestId,
+			"method": method,
+			"params": args.params || [],
+			"url": dappOrigin || "",
+			"name": dappName || "Unknown dApp",
+			"clientId": clientId,
+			"chainId": dappChainId,
+			"iconUrl": dappIconUrl || ""
+		}
+
         // Direct call to Nim connectorCallRPC -> status-go connector/api.go
         if (connectorController) {
             connectorController.connectorCallRPC(requestId, JSON.stringify(rpcRequest))
@@ -81,13 +81,13 @@ Item {
         _hasPermission = newAccounts.length > 0
 
         providerStateChanged()
-        accountsChangedEvent(accounts)
+		accuntsChangedEvent(accounts)
         console.log("[ConnectorManager] Accounts updated:", JSON.stringify(accounts))
-        return true
-    }
-    
-    function setConnected(isConnected) {
-        if (connected === isConnected) {
+		return true
+	}
+
+	function setConnected(isConnected) {
+		if (connected === isConnected) {
             return false
         }
 
@@ -118,27 +118,29 @@ Item {
         _initialConnectionDone = false
 
         providerStateChanged()
-        disconnectEvent({ code: 4900, message: "User disconnected" })  // EIP-1193: Disconnected
-        accountsChangedEvent([])
-        console.log("[ConnectorManager] State cleared")
-        return true
-    }
-    
-    // PUBLIC API
-    function disconnect() {
-        console.log("[ConnectorManager] Disconnecting dApp")
-        
-        clearState()
-        
-        if (connectorController) {
-            const effectiveUrl = dappOrigin || dappUrl
-            console.log("[ConnectorManager] Calling backend disconnect for:", effectiveUrl)
-            connectorController.disconnect(effectiveUrl)
-        }
-    }
-    
-    // HELPER FUNCTIONS
-    function shouldProcessSignal(event) {
+		disconnectEvent({ code: 4900, message: "User disconnected" })  // EIP-1193: Disconnected
+		accountsChangedEvent([])
+		console.log("[ConnectorManager] State cleared")
+		return true
+	}
+
+	// PUBLIC API
+	function disconnect() {
+		clearState()
+
+		if (connectorController) {
+			connectorController.disconnect(dappOrigin)
+		}
+	}
+
+	function changeAccount(newAccount) {
+		if (connectorController) {
+			connectorController.changeAccount(dappOrigin, clientId, newAccount)
+		}
+	}
+
+	// HELPER FUNCTIONS
+	function shouldProcessSignal(event) {
         // Filter by origin
         if (event.url && Utils.normalizeOrigin(event.url) !== Utils.normalizeOrigin(dappOrigin)) {
             console.log("[ConnectorManager] Ignoring signal for other origin:", event.url, "expected:", dappOrigin)
@@ -216,12 +218,23 @@ Item {
                     const chainIdHex = Utils.chainIdToHex(chainIdDecimal)
 
                     providerStateChanged()
-                    chainChangedEvent(chainIdHex)
-                    console.log("[ConnectorManager] Chain switched to:", chainIdHex)
-                }
-            } catch (error) {
-                console.error("[ConnectorManager] Error processing chainIdSwitched signal:", error)
-            }
-        }
-    }
+					chainChangedEvent(chainIdHex)
+					console.log("[ConnectorManager] Chain switched to:", chainIdHex)
+				}
+			} catch (error) {
+				console.error("[ConnectorManager] Error processing chainIdSwitched signal:", error)
+			}
+		}
+
+		function onAccountChanged(payload) {
+			try {
+				const data = JSON.parse(payload)
+				if (!shouldProcessSignal(data)) return
+				const newAccounts = data.sharedAccount ? [data.sharedAccount] : []
+				updateAccounts(newAccounts)
+			} catch (error) {
+				console.error("[ConnectorManager] Error processing accountChanged signal:", error)
+			}
+		}
+	}
 }

ui/app/AppLayouts/Browser/provider/qml/Utils.js

@@ -12,12 +12,17 @@ function accountsDidChange(oldAccounts, newAccounts) {
 
 function normalizeOrigin(url) {
     if (!url) return ""
-    let normalized = url.toString()
-    // Remove trailing slash from origin
-    if (normalized.endsWith("/")) {
-        normalized = normalized.slice(0, -1)
+    try {
+        const urlObj = new URL(url.toString())
+        // This ensures https://opensea.io/ and https://opensea.io/path both become https://opensea.io
+        return urlObj.origin
+    } catch (e) {
+        let normalized = url.toString()
+        if (normalized.endsWith("/")) {
+            normalized = normalized.slice(0, -1)
+        }
+        return normalized
     }
-    return normalized
 }
 
 // Convert decimal chainId to hex string (e.g., 1 -> "0x1", 137 -> "0x89")