status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(settings): Fixed changing network urls (#14353)

This commit is contained in:
Cuteivist 2024-05-13 12:06:05 +02:00 committed by GitHub
parent 6caea1c56e
commit 406f12d239
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/modules/main/wallet_section/networks/controller.nim
View File

@ -64,8 +64,8 @@ proc isGoerliEnabled*(self: Controller): bool =
proc toggleIsGoerliEnabled*(self: Controller) = proc toggleIsGoerliEnabled*(self: Controller) =
self.walletAccountService.toggleIsGoerliEnabled() self.walletAccountService.toggleIsGoerliEnabled()
proc updateNetworkEndPointValues*(self: Controller, chainId: int, newMainRpcInput, newFailoverRpcUrl: string, revertToDefault: bool) = proc updateNetworkEndPointValues*(self: Controller, chainId: int, testNetwork: bool, newMainRpcInput, newFailoverRpcUrl: string, revertToDefault: bool) =
self.networkService.updateNetworkEndPointValues(chainId, newMainRpcInput, newFailoverRpcUrl, revertToDefault) self.networkService.updateNetworkEndPointValues(chainId, testNetwork, newMainRpcInput, newFailoverRpcUrl, revertToDefault)
proc fetchChainIdForUrl*(self: Controller, url: string, isMainUrl: bool) = proc fetchChainIdForUrl*(self: Controller, url: string, isMainUrl: bool) =
self.walletAccountService.fetchChainIdForUrl(url, isMainUrl) self.walletAccountService.fetchChainIdForUrl(url, isMainUrl)

2
src/app/modules/main/wallet_section/networks/io_interface.nim
View File

@ -38,7 +38,7 @@ method setNetworksState*(self: AccessInterface, chainIds: seq[int], enable: bool
method refreshNetworks*(self: AccessInterface) {.base.} = method refreshNetworks*(self: AccessInterface) {.base.} =
raise newException(ValueError, "No implementation available") raise newException(ValueError, "No implementation available")
method updateNetworkEndPointValues*(self: AccessInterface, chainId: int, newMainRpcInput, newFailoverRpcUrl: string, revertToDefault: bool) {.base.} = method updateNetworkEndPointValues*(self: AccessInterface, chainId: int, testNetwork: bool, newMainRpcInput, newFailoverRpcUrl: string, revertToDefault: bool) {.base.} =
raise newException(ValueError, "No implementation available") raise newException(ValueError, "No implementation available")
method fetchChainIdForUrl*(self: AccessInterface, url: string, isMainUrl: bool) {.base.} = method fetchChainIdForUrl*(self: AccessInterface, url: string, isMainUrl: bool) {.base.} =

4
src/app/modules/main/wallet_section/networks/module.nim
View File

@ -73,8 +73,8 @@ method toggleIsGoerliEnabled*(self: Module) =
method setNetworksState*(self: Module, chainIds: seq[int], enabled: bool) = method setNetworksState*(self: Module, chainIds: seq[int], enabled: bool) =
self.controller.setNetworksState(chainIds, enabled) self.controller.setNetworksState(chainIds, enabled)
method updateNetworkEndPointValues*(self: Module, chainId: int, newMainRpcInput, newFailoverRpcUrl: string, revertToDefault: bool) = method updateNetworkEndPointValues*(self: Module, chainId: int, testNetwork: bool, newMainRpcInput, newFailoverRpcUrl: string, revertToDefault: bool) =
self.controller.updateNetworkEndPointValues(chainId, newMainRpcInput, newFailoverRpcUrl, revertToDefault) self.controller.updateNetworkEndPointValues(chainId, testNetwork, newMainRpcInput, newFailoverRpcUrl, revertToDefault)
method fetchChainIdForUrl*(self: Module, url: string, isMainUrl: bool) = method fetchChainIdForUrl*(self: Module, url: string, isMainUrl: bool) =
self.controller.fetchChainIdForUrl(url, isMainUrl) self.controller.fetchChainIdForUrl(url, isMainUrl)

4
src/app/modules/main/wallet_section/networks/view.nim
View File

@ -100,8 +100,8 @@ QtObject:
proc getBlockExplorerURL*(self: View, chainId: int): string {.slot.} = proc getBlockExplorerURL*(self: View, chainId: int): string {.slot.} =
return self.flatNetworks.getBlockExplorerURL(chainId) return self.flatNetworks.getBlockExplorerURL(chainId)
proc updateNetworkEndPointValues*(self: View, chainId: int, newMainRpcInput: string, newFailoverRpcUrl: string, revertToDefault: bool) {.slot.} = proc updateNetworkEndPointValues*(self: View, chainId: int, testNetwork: bool, newMainRpcInput: string, newFailoverRpcUrl: string, revertToDefault: bool) {.slot.} =
self.delegate.updateNetworkEndPointValues(chainId, newMainRpcInput, newFailoverRpcUrl, revertToDefault) self.delegate.updateNetworkEndPointValues(chainId, testNetwork, newMainRpcInput, newFailoverRpcUrl, revertToDefault)
proc fetchChainIdForUrl*(self: View, url: string, isMainUrl: bool) {.slot.} = proc fetchChainIdForUrl*(self: View, url: string, isMainUrl: bool) {.slot.} =
self.delegate.fetchChainIdForUrl(url, isMainUrl) self.delegate.fetchChainIdForUrl(url, isMainUrl)

10
src/app_service/service/network/service.nim
View File

@ -93,11 +93,10 @@ proc upsertNetwork*(self: Service, network: NetworkItem): bool =
proc deleteNetwork*(self: Service, network: NetworkItem) = proc deleteNetwork*(self: Service, network: NetworkItem) =
discard backend.deleteEthereumChain(network.chainId) discard backend.deleteEthereumChain(network.chainId)
proc getNetworkByChainId*(self: Service, chainId: int): NetworkItem = proc getNetworkByChainId*(self: Service, chainId: int, testNetworksEnabled: bool): NetworkItem =
var networks = self.combinedNetworks var networks = self.combinedNetworks
if self.combinedNetworks.len == 0: if self.combinedNetworks.len == 0:
networks = self.fetchNetworks() networks = self.fetchNetworks()
let testNetworksEnabled = self.settingsService.areTestNetworksEnabled()
for network in networks: for network in networks:
let net = if testNetworksEnabled: network.test let net = if testNetworksEnabled: network.test
else: network.prod else: network.prod
@ -105,6 +104,9 @@ proc getNetworkByChainId*(self: Service, chainId: int): NetworkItem =
return net return net
return nil return nil
proc getNetworkByChainId*(self: Service, chainId: int): NetworkItem =
return self.getNetworkByChainId(chainId, self.settingsService.areTestNetworksEnabled())
proc setNetworksState*(self: Service, chainIds: seq[int], enabled: bool) = proc setNetworksState*(self: Service, chainIds: seq[int], enabled: bool) =
for chainId in chainIds: for chainId in chainIds:
let network = self.getNetworkByChainId(chainId) let network = self.getNetworkByChainId(chainId)
@ -140,8 +142,8 @@ proc getAppNetwork*(self: Service): NetworkItem =
quit() # quit the app quit() # quit the app
return network return network
proc updateNetworkEndPointValues*(self: Service, chainId: int, newMainRpcInput, newFailoverRpcUrl: string, revertToDefault: bool) = proc updateNetworkEndPointValues*(self: Service, chainId: int, testNetwork: bool, newMainRpcInput, newFailoverRpcUrl: string, revertToDefault: bool) =
let network = self.getNetworkByChainId(chainId) let network = self.getNetworkByChainId(chainId, testNetwork)
if not network.isNil: if not network.isNil:
if network.rpcURL != newMainRpcInput: if network.rpcURL != newMainRpcInput:

4
ui/app/AppLayouts/Profile/stores/WalletStore.qml
View File

@ -108,8 +108,8 @@ QtObject {
return networksModuleInst.fetchChainIdForUrl(url, isMainUrl) return networksModuleInst.fetchChainIdForUrl(url, isMainUrl)
} }
function updateNetworkEndPointValues(chainId, newMainRpcInput, newFailoverRpcUrl, revertToDefault) { function updateNetworkEndPointValues(chainId, testNetwork, newMainRpcInput, newFailoverRpcUrl, revertToDefault) {
networksModuleInst.updateNetworkEndPointValues(chainId, newMainRpcInput, newFailoverRpcUrl, revertToDefault) networksModuleInst.updateNetworkEndPointValues(chainId, testNetwork, newMainRpcInput, newFailoverRpcUrl, revertToDefault)
} }
function updateWalletAccountPreferredChains(address, preferredChainIds) { function updateWalletAccountPreferredChains(address, preferredChainIds) {

3
ui/app/AppLayouts/Profile/views/WalletView.qml
View File

@ -264,9 +264,10 @@ SettingsContentBase {
Layout.fillWidth: true Layout.fillWidth: true
networksModule: root.walletStore.networksModuleInst networksModule: root.walletStore.networksModuleInst
networkRPCChanged: root.walletStore.networkRPCChanged networkRPCChanged: root.walletStore.networkRPCChanged
areTestNetworksEnabled: root.walletStore.areTestNetworksEnabled
onEvaluateRpcEndPoint: root.walletStore.evaluateRpcEndPoint(url, isMainUrl) onEvaluateRpcEndPoint: root.walletStore.evaluateRpcEndPoint(url, isMainUrl)
onUpdateNetworkValues: { onUpdateNetworkValues: {
root.walletStore.updateNetworkEndPointValues(chainId, newMainRpcInput, newFailoverRpcUrl, revertToDefault) root.walletStore.updateNetworkEndPointValues(chainId, testNetwork, newMainRpcInput, newFailoverRpcUrl, revertToDefault)
stackContainer.currentIndex = networksViewIndex stackContainer.currentIndex = networksViewIndex
} }
} }

12
ui/app/AppLayouts/Profile/views/wallet/EditNetworkView.qml
View File

@ -13,9 +13,15 @@ ColumnLayout {
property var networksModule property var networksModule
property var combinedNetwork property var combinedNetwork
property var networkRPCChanged property var networkRPCChanged
property bool areTestNetworksEnabled: false
signal evaluateRpcEndPoint(string url, bool isMainUrl) signal evaluateRpcEndPoint(string url, bool isMainUrl)
signal updateNetworkValues(int chainId, string newMainRpcInput, string newFailoverRpcUrl, bool revertToDefault) signal updateNetworkValues(int chainId, bool testNetwork, string newMainRpcInput, string newFailoverRpcUrl, bool revertToDefault)
onVisibleChanged: {
if (visible)
editPreviwTabBar.currentIndex = root.areTestNetworksEnabled ? 1 : 0
}
StatusTabBar { StatusTabBar {
id: editPreviwTabBar id: editPreviwTabBar
@ -47,7 +53,7 @@ ColumnLayout {
networksModule: root.networksModule networksModule: root.networksModule
networkRPCChanged: root.networkRPCChanged networkRPCChanged: root.networkRPCChanged
onEvaluateRpcEndPoint: root.evaluateRpcEndPoint(url, isMainUrl) onEvaluateRpcEndPoint: root.evaluateRpcEndPoint(url, isMainUrl)
onUpdateNetworkValues: root.updateNetworkValues(chainId, newMainRpcInput, newFailoverRpcUrl, revertToDefault) onUpdateNetworkValues: root.updateNetworkValues(chainId, false, newMainRpcInput, newFailoverRpcUrl, revertToDefault)
} }
} }
@ -58,7 +64,7 @@ ColumnLayout {
networksModule: root.networksModule networksModule: root.networksModule
networkRPCChanged: root.networkRPCChanged networkRPCChanged: root.networkRPCChanged
onEvaluateRpcEndPoint: root.evaluateRpcEndPoint(url, isMainUrl) onEvaluateRpcEndPoint: root.evaluateRpcEndPoint(url, isMainUrl)
onUpdateNetworkValues: root.updateNetworkValues(chainId, newMainRpcInput, newFailoverRpcUrl, revertToDefault) onUpdateNetworkValues: root.updateNetworkValues(chainId, true, newMainRpcInput, newFailoverRpcUrl, revertToDefault)
} }
} }
} }