From f9b08abd72d358f450d19cf6d5197f8855e05cc3 Mon Sep 17 00:00:00 2001
From: Richard Ramos <info@richardramos.me>
Date: Mon, 15 Nov 2021 11:06:25 -0400
Subject: [PATCH] fix: review

---
 src/app/modules/main/browser_section/provider/module.nim | 2 +-
 src/app/modules/main/browser_section/provider/view.nim   | 2 +-
 src/app_service/service/dapp_permissions/service.nim     | 5 ++++-
 ui/app/AppLayouts/Browser/stores/Web3ProviderStore.qml   | 2 ++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/app/modules/main/browser_section/provider/module.nim b/src/app/modules/main/browser_section/provider/module.nim
index 039f1872da..a381b3adf1 100644
--- a/src/app/modules/main/browser_section/provider/module.nim
+++ b/src/app/modules/main/browser_section/provider/module.nim
@@ -35,9 +35,9 @@ method delete*(self: Module) =
 
 method load*(self: Module) =
   singletonInstance.engine.setRootContextProperty("providerModule", self.viewVariant)
-  self.view.load()
   self.view.dappsAddress = self.controller.getDappsAddress()
   self.view.networkId = self.controller.getCurrentNetworkDetails().config.networkId
+  self.view.load()
 
 method isLoaded*(self: Module): bool =
   return self.moduleLoaded
diff --git a/src/app/modules/main/browser_section/provider/view.nim b/src/app/modules/main/browser_section/provider/view.nim
index c7f5eb0082..b30b15ae84 100644
--- a/src/app/modules/main/browser_section/provider/view.nim
+++ b/src/app/modules/main/browser_section/provider/view.nim
@@ -46,7 +46,7 @@ QtObject:
   proc networkId*(self: View): int {.slot.} =
     result = self.networkId
 
-  QtProperty[string] networkId:
+  QtProperty[int] networkId:
     read = networkId
     notify = networkIdChanged
 
diff --git a/src/app_service/service/dapp_permissions/service.nim b/src/app_service/service/dapp_permissions/service.nim
index dbbbcc2760..c05ebf088c 100644
--- a/src/app_service/service/dapp_permissions/service.nim
+++ b/src/app_service/service/dapp_permissions/service.nim
@@ -55,6 +55,7 @@ method clearPermissions*(self: Service, dapp: string): bool =
 
 method revoke*(self: Service, permission: Permission): bool =
   try:
+    var dappsToDelete: seq[string] = @[]
     for dapp in self.dapps.mvalues:
       if dapp.permissions.contains(permission):
         dapp.permissions.excl(permission)
@@ -62,7 +63,9 @@ method revoke*(self: Service, permission: Permission): bool =
           discard status_go.addDappPermissions(dapp.name, dapp.permissions.toSeq().mapIt($it))
         else:
           discard status_go.deleteDappPermissions(dapp.name)
-          self.dapps.del(dapp.name)
+          dappsToDelete.add(dapp.name)
+    for dappName in dappsToDelete:
+      self.dapps.del(dappName)
     return true
   except Exception as e:
     let errDescription = e.msg
diff --git a/ui/app/AppLayouts/Browser/stores/Web3ProviderStore.qml b/ui/app/AppLayouts/Browser/stores/Web3ProviderStore.qml
index b6e906c914..b1d9aa2988 100644
--- a/ui/app/AppLayouts/Browser/stores/Web3ProviderStore.qml
+++ b/ui/app/AppLayouts/Browser/stores/Web3ProviderStore.qml
@@ -8,6 +8,8 @@ QtObject {
     property var web3ProviderInst: providerModule
     property var urlENSDictionary: ({})
 
+    property int networkId: providerModule.networkId
+
     function determineRealURL(text){
         var url = RootStore.getUrlFromUserInput(text);
         var host = providerModule.getHost(url);