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(@wallet): add restart required for changes 

fixes #13380
This commit is contained in:
Anthony Laibe 2024-02-12 14:13:36 +01:00 committed by Anthony Laibe
parent d41affabb9
commit a1c2d9a4b2
4 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,8 @@ QtObject {
readonly property var combinedNetworks: networksModule.combinedNetworks
property var selectedAccount
property var networkRPCChanged: ({}) // add network id to the object if changed
function toggleTestNetworksEnabled(){
networksModule.toggleTestNetworksEnabled()
}

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

@ -254,6 +254,7 @@ SettingsContentBase {
Layout.fillHeight: true
Layout.fillWidth: true
networksModule: root.walletStore.networksModule
networkRPCChanged: root.walletStore.networkRPCChanged
onEvaluateRpcEndPoint: root.walletStore.evaluateRpcEndPoint(url, isMainUrl)
onUpdateNetworkValues: {
root.walletStore.updateNetworkEndPointValues(chainId, newMainRpcInput, newFailoverRpcUrl, revertToDefault)

33
ui/app/AppLayouts/Profile/views/wallet/EditNetworkForm.qml
View File

@ -14,6 +14,7 @@ ColumnLayout {
property var network
property var networksModule
property var networkRPCChanged
signal evaluateRpcEndPoint(string url, bool isMainUrl)
signal updateNetworkValues(int chainId, string newMainRpcInput, string newFailoverRpcUrl, bool revertToDefault)
@ -25,7 +26,8 @@ ColumnLayout {
PingUnsuccessful,
SameAsOther,
NotSameChain,
Empty
Empty,
RestartRequired
}
QtObject {
@ -63,6 +65,8 @@ ColumnLayout {
return qsTr("Main and failover JSON RPC URLs are the same")
case EditNetworkForm.NotSameChain:
return qsTr("Chain ID returned from JSON RPC doesn’t match %1").arg(network.chainName)
case EditNetworkForm.RestartRequired:
return qsTr("Restart required for changes to take effect")
default: return ""
}
}
@ -73,6 +77,7 @@ ColumnLayout {
return Theme.palette.baseColor1
case EditNetworkForm.SameAsOther:
case EditNetworkForm.NotSameChain:
case EditNetworkForm.RestartRequired:
return Theme.palette.warningColor1
case EditNetworkForm.Verified:
return Theme.palette.successColor1
@ -86,6 +91,7 @@ ColumnLayout {
case EditNetworkForm.Verified:
case EditNetworkForm.SameAsOther:
case EditNetworkForm.NotSameChain:
case EditNetworkForm.RestartRequired:
return Text.AlignLeft
default: return Text.AlignRight
}
@ -109,6 +115,7 @@ ColumnLayout {
fallback = network.originalFallbackURL
}
root.updateNetworkValues(network.chainId, main, fallback, false)
root.networkRPCChanged[network.chainId] = true
}
}
@ -200,11 +207,12 @@ ColumnLayout {
if (text === "") {
d.evaluationStatusMainRpc = EditNetworkForm.Empty
return
}
else {
if ((d.mask(network.originalRpcURL) === text) ||
(network.rpcURL === text)) {
} else {
if ((d.mask(network.originalRpcURL) === text) || (network.rpcURL === text)) {
d.evaluationStatusMainRpc = EditNetworkForm.UnTouched
if (root.networkRPCChanged[network.chainId]) {
d.evaluationStatusMainRpc = EditNetworkForm.RestartRequired
}
} else {
d.evaluationStatusMainRpc = EditNetworkForm.Pending
Qt.callLater(d.evaluateRpcEndPoint, text, true);
@ -258,9 +266,11 @@ ColumnLayout {
return
}
if ((d.mask(network.originalFallbackURL) === text) ||
(network.fallbackURL === text)) {
if ((d.mask(network.originalFallbackURL) === text) || (network.fallbackURL === text)) {
d.evaluationStatusFallBackRpc = EditNetworkForm.UnTouched
if (root.networkRPCChanged[network.chainId]) {
d.evaluationStatusFallBackRpc = EditNetworkForm.RestartRequired
}
} else {
d.evaluationStatusFallBackRpc = EditNetworkForm.Pending
Qt.callLater(d.evaluateRpcEndPoint, text, false);
@ -301,7 +311,10 @@ ColumnLayout {
normalColor: "transparent"
enabled: (failoverRpcUrlInput.text !== d.mask(network.originalFallbackURL)) ||
(mainRpcInput.text !== d.mask(network.originalRpcURL))
onClicked: d.revertValues()
onClicked: {
d.revertValues()
root.networkRPCChanged[network.chainId] = true
}
}
StatusButton {
objectName: "editNetworkSaveButton"
@ -314,7 +327,9 @@ ColumnLayout {
d.evaluationStatusMainRpc === EditNetworkForm.Empty ||
d.evaluationStatusFallBackRpc === EditNetworkForm.Empty ||
d.evaluationStatusMainRpc === EditNetworkForm.NotSameChain ||
d.evaluationStatusFallBackRpc === EditNetworkForm.NotSameChain
d.evaluationStatusFallBackRpc === EditNetworkForm.NotSameChain ||
d.evaluationStatusMainRpc === EditNetworkForm.RestartRequired ||
d.evaluationStatusFallBackRpc === EditNetworkForm.RestartRequired
) && warningCheckbox.checked
onClicked: {

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

@ -12,6 +12,7 @@ ColumnLayout {
property var networksModule
property var combinedNetwork
property var networkRPCChanged
signal evaluateRpcEndPoint(string url, bool isMainUrl)
signal updateNetworkValues(int chainId, string newMainRpcInput, string newFailoverRpcUrl, bool revertToDefault)
@ -44,6 +45,7 @@ ColumnLayout {
EditNetworkForm {
network: !!root.combinedNetwork ? root.combinedNetwork.prod: null
networksModule: root.networksModule
networkRPCChanged: root.networkRPCChanged
onEvaluateRpcEndPoint: root.evaluateRpcEndPoint(url, isMainUrl)
onUpdateNetworkValues: root.updateNetworkValues(chainId, newMainRpcInput, newFailoverRpcUrl, revertToDefault)
}
@ -54,6 +56,7 @@ ColumnLayout {
EditNetworkForm {
network: !!root.combinedNetwork ? root.combinedNetwork.test: null
networksModule: root.networksModule
networkRPCChanged: root.networkRPCChanged
onEvaluateRpcEndPoint: root.evaluateRpcEndPoint(url, isMainUrl)
onUpdateNetworkValues: root.updateNetworkValues(chainId, newMainRpcInput, newFailoverRpcUrl, revertToDefault)
}