feat(dapp-browser)_: connected dapps popup

fixes #19223

Author: friofry

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

@@ -8,6 +8,7 @@ type ConnectorSendRequestAccountsSignal* = ref object of Signal
   name*: string
   iconUrl*: string
   requestId*: string
+  clientId*: string
 
 type ConnectorSendTransactionSignal* = ref object of Signal
   url*: string
@@ -16,18 +17,21 @@ type ConnectorSendTransactionSignal* = ref object of Signal
   requestId*: string
   chainId*: int
   txArgs*: string
+  clientId*: string
 
 type ConnectorGrantDAppPermissionSignal* = ref object of Signal
   url*: string
   name*: string
   iconUrl*: string
   chains*: string
   sharedAccount*: string
+  clientId*: string
 
 type ConnectorRevokeDAppPermissionSignal* = ref object of Signal
   url*: string
   name*: string
   iconUrl*: string
+  clientId*: string
 
 type ConnectorSignSignal* = ref object of Signal
   url*: string
@@ -37,10 +41,12 @@ type ConnectorSignSignal* = ref object of Signal
   challenge*: string
   address*: string
   signMethod*: string
+  clientId*: string
 
 type ConnectorDAppChainIdSwitchedSignal* = ref object of Signal
   url*: string
   chainId*: string
+  clientId*: string
 
 type ConnectorAccountChangedSignal* = ref object of Signal
   url*: string
@@ -54,6 +60,7 @@ proc fromEvent*(T: type ConnectorSendRequestAccountsSignal, event: JsonNode): Co
   result.name = event["event"]{"name"}.getStr()
   result.iconUrl = event["event"]{"iconUrl"}.getStr()
   result.requestId = event["event"]{"requestId"}.getStr()
+  result.clientId = event["event"]{"clientId"}.getStr()
 
 proc fromEvent*(T: type ConnectorSendTransactionSignal, event: JsonNode): ConnectorSendTransactionSignal =
   result = ConnectorSendTransactionSignal()
@@ -64,6 +71,7 @@ proc fromEvent*(T: type ConnectorSendTransactionSignal, event: JsonNode): Connec
   result.requestId = event["event"]{"requestId"}.getStr()
   result.chainId = event["event"]{"chainId"}.getInt()
   result.txArgs = event["event"]{"txArgs"}.getStr()
+  result.clientId = event["event"]{"clientId"}.getStr()
 
 proc fromEvent*(T: type ConnectorGrantDAppPermissionSignal, event: JsonNode): ConnectorGrantDAppPermissionSignal =
   result = ConnectorGrantDAppPermissionSignal()
@@ -73,13 +81,15 @@ proc fromEvent*(T: type ConnectorGrantDAppPermissionSignal, event: JsonNode): Co
   result.iconUrl = event["event"]{"iconUrl"}.getStr()
   result.chains = $(event["event"]{"chains"})
   result.sharedAccount = event["event"]{"sharedAccount"}.getStr()
+  result.clientId = event["event"]{"clientId"}.getStr()
 
 proc fromEvent*(T: type ConnectorRevokeDAppPermissionSignal, event: JsonNode): ConnectorRevokeDAppPermissionSignal =
   result = ConnectorRevokeDAppPermissionSignal()
   result.signalType = SignalType.ConnectorRevokeDAppPermission
   result.url = event["event"]{"url"}.getStr()
   result.name = event["event"]{"name"}.getStr()
   result.iconUrl = event["event"]{"iconUrl"}.getStr()
+  result.clientId = event["event"]{"clientId"}.getStr()
 
 proc fromEvent*(T: type ConnectorSignSignal, event: JsonNode): ConnectorSignSignal =
   result = ConnectorSignSignal()
@@ -91,16 +101,18 @@ proc fromEvent*(T: type ConnectorSignSignal, event: JsonNode): ConnectorSignSign
   result.challenge = event["event"]{"challenge"}.getStr()
   result.address = event["event"]{"address"}.getStr()
   result.signMethod = event["event"]{"method"}.getStr()
+  result.clientId = event["event"]{"clientId"}.getStr()
 
 proc fromEvent*(T: type ConnectorDAppChainIdSwitchedSignal, event: JsonNode): ConnectorDAppChainIdSwitchedSignal =
   result = ConnectorDAppChainIdSwitchedSignal()
   result.signalType = SignalType.ConnectorDAppChainIdSwitched
   result.url = event["event"]{"url"}.getStr()
   result.chainId = event["event"]{"chainId"}.getStr()
+  result.clientId = event["event"]{"clientId"}.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()
+  result.sharedAccount = event["event"]{"sharedAccount"}.getStr()

src/app/modules/shared_modules/connector/controller.nim

@@ -77,6 +77,7 @@ QtObject:
         "url": params.url,
         "chains": params.chains,
         "sharedAccount": params.sharedAccount,
+        "clientId": params.clientId
       }
 
       controller.emitConnected(dappInfo.toJson())
@@ -87,6 +88,7 @@ QtObject:
         "icon": params.iconUrl,
         "name": params.name,
         "url": params.url,
+        "clientId": params.clientId
       }
 
       controller.emitDisconnected(dappInfo.toJson())
@@ -113,7 +115,8 @@ QtObject:
         let params = ConnectorDAppChainIdSwitchedSignal(e)
         let chainInfo = %*{
           "url": params.url,
-          "chainId": params.chainId
+          "chainId": params.chainId,
+          "clientId": params.clientId
         }
         controller.emitChainIdSwitched(chainInfo.toJson())
       except Exception as ex:
@@ -206,12 +209,15 @@ QtObject:
     result = self.service.rejectTransactionSigning(requestId)
     self.rejectTransactionResponse(sessionTopic, requestId, not result)
 
-  proc disconnect*(self: Controller, dAppUrl: string): bool {.slot.} =
-    result = self.service.recallDAppPermission(dAppUrl)
+  proc disconnect*(self: Controller, dAppUrl: string, clientId: string = ""): bool {.slot.} =
+    result = self.service.recallDAppPermission(dAppUrl, clientId)
 
   proc getDApps*(self: Controller): string {.slot.} =
     return self.service.getDApps()
 
+  proc getDAppsByClientId*(self: Controller, clientId: string): string {.slot.} =
+    return self.service.getDAppsByClientId(clientId)
+
   proc approveSigning*(self: Controller, sessionTopic: string, requestId: string, signature: string): bool {.slot.} =
     result = self.service.approveSignRequest(requestId, signature)
     self.approveSignResponse(sessionTopic, requestId, not result)

src/app_service/service/connector/service.nim

@@ -61,7 +61,7 @@ QtObject:
 
       var data = ConnectorSendRequestAccountsSignal(e)
 
-      if not data.requestId.len() == 0:
+      if data.requestId.len() == 0:
         error "ConnectorSendRequestAccountsSignal failed, requestId is empty"
         return
 
@@ -73,7 +73,7 @@ QtObject:
 
       var data = ConnectorSendTransactionSignal(e)
 
-      if not data.requestId.len() == 0:
+      if data.requestId.len() == 0:
         error "ConnectorSendTransactionSignal failed, requestId is empty"
         return
 
@@ -101,10 +101,13 @@ QtObject:
 
       var data = ConnectorSignSignal(e)
 
-      if not data.requestId.len() == 0:
+      debug "ConnectorSign received", requestId=data.requestId, requestIdLen=data.requestId.len()
+      
+      if data.requestId.len() == 0:
         error "ConnectorSignSignal failed, requestId is empty"
         return
 
+      debug "ConnectorSign emitting signal", requestId=data.requestId
       self.events.emit(SIGNAL_CONNECTOR_EVENT_CONNECTOR_SIGN, data)
     )
     self.events.on(SignalType.ConnectorDAppChainIdSwitched.event, proc(e: Args) =
@@ -175,9 +178,9 @@ QtObject:
   proc rejectDappConnect*(self: Service, requestId: string): bool =
     rejectRequest(self, requestId, status_go.requestAccountsRejectedFinishedRpc, "requestAccountsRejectedFinishedRpc failed: ")
 
-  proc recallDAppPermission*(self: Service, dAppUrl: string): bool =
+  proc recallDAppPermission*(self: Service, dAppUrl: string, clientId: string = ""): bool =
     try:
-      return status_go.recallDAppPermissionFinishedRpc(dAppUrl)
+      return status_go.recallDAppPermissionFinishedRpc(dAppUrl, clientId)
 
     except Exception as e:
       error "recallDAppPermissionFinishedRpc failed: ", err=e.msg
@@ -196,6 +199,29 @@ QtObject:
       error "getDApps failed: ", err=e.msg
       return "[]"
 
+  proc getDAppsByClientId*(self: Service, clientId: string): string =
+    try:
+      let response = status_go.getPermittedDAppsList()
+      if not response.error.isNil:
+        raise newException(Exception, "Error getting connector dapp list: " & response.error.message)
+      
+      let jsonArray = $response.result
+      if jsonArray == "null":
+        return "[]"
+      
+      # Parse and filter by clientId
+      let allDapps = parseJson(jsonArray)
+      var filteredDapps = newJArray()
+      
+      for dapp in allDapps:
+        if dapp.hasKey("clientId") and dapp["clientId"].getStr() == clientId:
+          filteredDapps.add(dapp)
+      
+      return $filteredDapps
+    except Exception as e:
+      error "getDAppsByClientId failed: ", err=e.msg
+      return "[]"
+
   proc approveSignRequest*(self: Service, requestId: string, signature: string): bool =
     try:
       var args = SignAcceptedArgs()

src/backend/connector.nim

@@ -24,9 +24,6 @@ type SendTransactionAcceptedArgs* = ref object of RootObj
 type RejectedArgs* = ref object of RootObj
   requestId* {.serializedFieldName("requestId").}: string
 
-type RecallDAppPermissionArgs* = ref object of RootObj
-  dAppUrl* {.serializedFieldName("dAppUrl").}: string
-
 type SignAcceptedArgs* = ref object of RootObj
   requestId* {.serializedFieldName("requestId").}: string
   signature* {.serializedFieldName("signature").}: string
@@ -48,8 +45,9 @@ rpc(sendTransactionRejected, "connector"):
 rpc(requestAccountsRejected, "connector"):
   args: RejectedArgs
 
-rpc(recallDAppPermission, "connector"):
-  dAppUrl: string
+rpc(recallDAppPermissionV2, "connector"):
+  url: string
+  clientId: string
 
 rpc(getPermittedDAppsList, "connector"):
   discard
@@ -81,8 +79,8 @@ proc sendTransactionAcceptedFinishedRpc*(args: SendTransactionAcceptedArgs): boo
 proc sendTransactionRejectedFinishedRpc*(args: RejectedArgs): bool =
   return isSuccessResponse(sendTransactionRejected(args))
 
-proc recallDAppPermissionFinishedRpc*(dAppUrl: string): bool =
-  return isSuccessResponse(recallDAppPermission(dAppUrl))
+proc recallDAppPermissionFinishedRpc*(dAppUrl: string, clientId: string): bool =
+  return isSuccessResponse(recallDAppPermissionV2(dAppUrl, clientId))
 
 proc sendSignAcceptedFinishedRpc*(args: SignAcceptedArgs): bool =
   return isSuccessResponse(signAccepted(args))

ui/app/AppLayouts/Browser/BrowserLayout.qml

@@ -17,6 +17,7 @@ import shared.popups.send
 import shared.stores.send
 
 import AppLayouts.Browser.stores as BrowserStores
+import AppLayouts.Wallet.services.dapps
 
 import "provider/qml"
 import "popups"
@@ -40,6 +41,7 @@ StatusSectionLayout {
     required property BrowserStores.BrowserRootStore browserRootStore
     required property BrowserStores.BrowserWalletStore browserWalletStore
     required property var connectorController
+    property bool isDebugEnabled: false
 
     signal sendToRecipientRequested(string address)
 
@@ -62,6 +64,12 @@ StatusSectionLayout {
         }
     }
 
+    BCBrowserDappsProvider {
+        id: browserDappsProvider
+        connectorController: root.connectorController
+        clientId: connectorBridge.clientId  // "status-desktop/dapp-browser"
+    }
+
     QtObject {
         id: _internal
 
@@ -163,11 +171,21 @@ StatusSectionLayout {
             canGoBack: (!!_internal.currentWebView && _internal.currentWebView.canGoBack)
             canGoForward: (!!_internal.currentWebView && _internal.currentWebView.canGoForward)
             currentTabConnected: root.browserRootStore.currentTabConnected
+            browserDappsModel: browserDappsProvider.model
+            browserDappsCount: browserDappsProvider.model ? browserDappsProvider.model.count : 0
             onOpenHistoryPopup: (xPos, yPos) => historyMenu.popup(xPos, yPos)
             onGoBack: _internal.currentWebView.goBack()
             onGoForward: _internal.currentWebView.goForward()
             onReload: _internal.currentWebView.reload()
             onStopLoading: _internal.currentWebView.stop()
+            onOpenDappUrl: function(url) {
+                if (_internal.currentWebView) {
+                    _internal.currentWebView.url = _internal.determineRealURL(url)
+                }
+            }
+            onDisconnectDapp: function(dappUrl) {
+                connectorBridge.disconnect(dappUrl)
+            }
             onAddNewFavoriteClicked: function(xPos) {
                 Global.openPopup(addFavoriteModal,
                                  {
@@ -360,6 +378,7 @@ StatusSectionLayout {
                     }
                 }
                 onDisconnect: {
+                    connectorBridge.disconnectCurrentTab()
                     _internal.currentWebView.reload()
                     close()
                 }
@@ -451,6 +470,8 @@ StatusSectionLayout {
             favMenu: favoriteMenu
             addFavModal: addFavoriteModal
             downloadsMenu: downloadMenu
+            enableJsLogs: root.isDebugEnabled
+
             determineRealURLFn: function(url) {
                 return _internal.determineRealURL(url)
             }
@@ -532,12 +553,23 @@ StatusSectionLayout {
         target: _internal.currentWebView
         function onUrlChanged() {
             browserHeader.addressBar.text = root.browserRootStore.obtainAddress(_internal.currentWebView.url)
-            root.browserRootStore.currentTabConnected = false // TODO: Will be handled by connector https://github.com/status-im/status-desktop/issues/19223
 
+            if (_internal.currentWebView && _internal.currentWebView.url) {
+                const urlStr = _internal.currentWebView.url.toString()
+                const hostname = Utils.getHostname(urlStr)
+
+                root.browserRootStore.currentTabConnected = connectorBridge.hasWalletConnected(
+                    hostname,
+                    root.browserWalletStore.dappBrowserAccount.address
+                )
+            } else {
+                root.browserRootStore.currentTabConnected = false
+            }
+            
             // Update ConnectorBridge with current dApp metadata
             if (_internal.currentWebView && _internal.currentWebView.url) {
                 connectorBridge.connectorManager.updateDAppUrl(
-                    _internal.currentWebView.url, 
+                    _internal.currentWebView.url,
                     _internal.currentWebView.title,
                     _internal.currentWebView.icon
                 )

ui/app/AppLayouts/Browser/panels/BrowserHeader.qml

@@ -7,6 +7,7 @@ import StatusQ.Core.Theme
 import StatusQ.Core.Utils as SQUtils
 
 import shared.controls
+import AppLayouts.Wallet.controls
 
 import utils
 
@@ -29,6 +30,9 @@ Rectangle {
     property string dappBrowserAccIcon: ""
     property var settingMenu
 
+    property var browserDappsModel: null
+    property int browserDappsCount: 0
+
     signal addNewFavoriteClicked(int xPos)
     signal launchInBrowser(string url)
     signal openHistoryPopup(int xPos, int yPos)
@@ -37,6 +41,8 @@ Rectangle {
     signal reload()
     signal stopLoading()
     signal openWalletMenu()
+    signal openDappUrl(string url)
+    signal disconnectDapp(string dappUrl)
 
     QtObject {
         id: _internal
@@ -158,6 +164,30 @@ Rectangle {
             }
         }
 
+        DappsComboBox {
+            Layout.preferredWidth: 38
+            Layout.preferredHeight: 38
+            spacing: 8
+            
+            visible: true
+            enabled: true
+            model: root.browserDappsModel
+            showConnectButton: false
+            
+            onDisconnectDapp: function(dappUrl) {
+                root.disconnectDapp(dappUrl)
+            }
+            
+            onDappClicked: function(dappUrl) {
+                root.openDappUrl(dappUrl)
+            }
+            
+            onConnectDapp: {
+                console.log("[Browser] Connect new dApp requested")
+                // Can open a modal or use DAppsWorkflow in the future
+            }
+        }
+
         Loader {
             Layout.preferredWidth: 44
             Layout.preferredHeight: 44