fix(@desktop/wallet): Fix issues in Send Modal

Khushboo-dev-cpp · Khushboo-dev-cpp · commit ace0d3ce87ae · 2025-06-19T12:43:39.000+02:00
1. The fees text always show "Fees on Mainnet" even though some other chain is selected 2. Time shows as ~5 instead 0f ~5s 3. Eth balance is repeated twice in token selector incase of Mainnet and Optimism fixes #18103
diff --git a/src/app/modules/main/wallet_section/assets/controller.nim b/src/app/modules/main/wallet_section/assets/controller.nim
@@ -34,7 +34,6 @@ proc buildAllTokens*(self: Controller, addresses: seq[string]) =
 
 proc init*(self: Controller) =
   let walletAddresses = self.walletAccountService.getWalletAddresses()
-  self.buildAllTokens(walletAddresses)
   discard
 
 proc getChainIds*(self: Controller): seq[int] =
diff --git a/src/app_service/service/network_connection/service.nim b/src/app_service/service/network_connection/service.nim
@@ -246,10 +246,17 @@ QtObject:
       self.events.emit(SIGNAL_CONNECTION_UPDATE, self.convertConnectionStatusToNetworkConnectionsArgs(COLLECTIBLES, self.connectionStatus[COLLECTIBLES]))
       discard collectibles_backend.refetchOwnedCollectibles()
 
+  proc checkIfConnected*(self: Service, website: string): bool =
+    if self.connectionStatus.hasKey(website) and self.connectionStatus[website].completelyDown:
+      return false
+    return true
+
   proc networkConnected*(self: Service, connected: bool) =
     if connected:
-      self.walletService.reloadAccountTokens()
-      self.tokenService.rebuildMarketData()
+      if not self.checkIfConnected(BLOCKCHAINS):
+        self.walletService.reloadAccountTokens()
+      if not self.checkIfConnected(MARKET):
+        self.tokenService.rebuildMarketData()
       discard collectibles_backend.refetchOwnedCollectibles()
     else:
       if(self.connectionStatus.hasKey(BLOCKCHAINS)):
@@ -258,8 +265,3 @@ QtObject:
         self.connectionStatus[MARKET] = newConnectionStatus()
       if(self.connectionStatus.hasKey(COLLECTIBLES)):
         self.connectionStatus[COLLECTIBLES] = newConnectionStatus()
-
-  proc checkIfConnected*(self: Service, website: string): bool =
-    if self.connectionStatus.hasKey(website) and self.connectionStatus[website].completelyDown:
-      return false
-    return true
diff --git a/storybook/pages/SimpleTransactionsFeesPage.qml b/storybook/pages/SimpleTransactionsFeesPage.qml
@@ -24,6 +24,7 @@ SplitView {
             fiatFees: qsTr("1.45 EUR")
             loading: loadingCheckbox.checked
             error: errorCheckbox.checked
+            networkName: "Mainnet"
         }
     }
 
diff --git a/storybook/qmlTests/tests/tst_SimpleTransactionsFees.qml b/storybook/qmlTests/tests/tst_SimpleTransactionsFees.qml
@@ -41,7 +41,7 @@ Item {
 
             compare(background.color, Theme.palette.indirectColor1)
             compare(gasIcon.asset.name, "gas")
-            compare(infoText.text, qsTr("Est Mainnet transaction fee"))
+            compare(infoText.text, qsTr("Est %1 transaction fee").arg(controlUnderTest.networkName))
             compare(cryptoFeesText.text, "XXXXXXXXXX")
             verify(cryptoFeesText.loading)
             compare(cryptoFeesText.customColor, Theme.palette.baseColor1)
@@ -65,10 +65,11 @@ Item {
 
             controlUnderTest.cryptoFees = "0.0007 ETH"
             controlUnderTest.fiatFees = "1.45 EUR"
+            controlUnderTest.networkName = "Mainnet"
 
             compare(background.color, Theme.palette.indirectColor1)
             compare(gasIcon.asset.name, "gas")
-            compare(infoText.text, qsTr("Est Mainnet transaction fee"))
+            compare(infoText.text, qsTr("Est %1 transaction fee").arg(controlUnderTest.networkName))
             compare(cryptoFeesText.text,"0.0007 ETH")
             verify(!cryptoFeesText.loading)
             compare(cryptoFeesText.customColor, Theme.palette.baseColor1)
@@ -94,7 +95,7 @@ Item {
 
             compare(background.color, Theme.palette.indirectColor1)
             compare(gasIcon.asset.name, "gas")
-            compare(infoText.text, qsTr("Est Mainnet transaction fee"))
+            compare(infoText.text, qsTr("Est %1 transaction fee").arg(controlUnderTest.networkName))
             compare(cryptoFeesText.text,"XXXXXXXXXX")
             verify(cryptoFeesText.loading)
             compare(cryptoFeesText.customColor, Theme.palette.baseColor1)
@@ -104,10 +105,11 @@ Item {
 
             controlUnderTest.cryptoFees = "0.0007 ETH"
             controlUnderTest.fiatFees = "1.45 EUR"
+            controlUnderTest.networkName = "Optimism"
 
             compare(background.color, Theme.palette.indirectColor1)
             compare(gasIcon.asset.name, "gas")
-            compare(infoText.text, qsTr("Est Mainnet transaction fee"))
+            compare(infoText.text, qsTr("Est %1 transaction fee").arg(controlUnderTest.networkName))
             compare(cryptoFeesText.text,"0.0007 ETH")
             verify(cryptoFeesText.loading)
             compare(cryptoFeesText.customColor, Theme.palette.baseColor1)
@@ -132,10 +134,11 @@ Item {
             controlUnderTest.error = true
             controlUnderTest.cryptoFees = "0.0007 ETH"
             controlUnderTest.fiatFees = "1.45 EUR"
+            controlUnderTest.networkName = "Mainnet"
 
             compare(background.color, Theme.palette.indirectColor1)
             compare(gasIcon.asset.name, "gas")
-            compare(infoText.text, qsTr("Est Mainnet transaction fee"))
+            compare(infoText.text, qsTr("Est %1 transaction fee").arg(controlUnderTest.networkName))
             compare(cryptoFeesText.text,"0.0007 ETH")
             verify(!cryptoFeesText.loading)
             compare(cryptoFeesText.customColor, Theme.palette.dangerColor1)
diff --git a/storybook/src/Models/TokensBySymbolModel.qml b/storybook/src/Models/TokensBySymbolModel.qml
@@ -47,6 +47,7 @@ ListModel {
             symbol: "STT",
             sources: ";" + status + ";",
             addressPerChain: [
+                { chainId: 1, address: "0x3d6afaa395c31fcd391fe3d562e75fe9e8ec7e6a"},
                 {chainId: 5, address: "0x3d6afaa395c31fcd391fe3d562e75fe9e8ec7e6a"},
                 { chainId: 11155420, address: "0x3d6afaa395c31fcd391fe3d562e75fe9e8ec7e6a"},
                 { chainId: 421614, address: "0x3d6afaa395c31fcd391fe3d562e75fe9e8ec7e6a"},
@@ -140,6 +141,7 @@ ListModel {
             communityId: "",
             sources: ";" + uniswap + ";" + status + ";",
             addressPerChain: [
+                { chainId: 1, address: "0xda10009cbd5d07dd0cecc66161fc93d7c9000da1"},
                 { chainId: 11155111, address: "0xda10009cbd5d07dd0cecc66161fc93d7c9000da1"},
                 { chainId: 11155420, address: "0xda10009cbd5d07dd0cecc66161fc93d7c9000da1"},
             ],
diff --git a/ui/app/AppLayouts/Wallet/WalletUtils.qml b/ui/app/AppLayouts/Wallet/WalletUtils.qml
@@ -91,7 +91,7 @@ QtObject {
         if (estimatedTime >= 60) {
             return qsTr(">60s")
         }
-        return qsTr("~%1").arg(estimatedTime)
+        return qsTr("~%1s").arg(estimatedTime)
     }
 
     function getRouterErrorBasedOnCode(code) {
diff --git a/ui/app/AppLayouts/Wallet/panels/SimpleTransactionsFees.qml b/ui/app/AppLayouts/Wallet/panels/SimpleTransactionsFees.qml
@@ -18,6 +18,7 @@ Control {
     property bool loading
     /** property to set error state in the fees component **/
     property bool error
+    property string networkName
 
     QtObject {
         id: d
@@ -63,7 +64,7 @@ Control {
                 lineHeightMode: Text.FixedHeight
                 lineHeight: 22
 
-                text: qsTr("Est Mainnet transaction fee")
+                text: qsTr("Est %1 transaction fee").arg(root.networkName)
             }
             StatusTextWithLoadingState {
                 id: cryptoFeesText
diff --git a/ui/app/AppLayouts/Wallet/popups/simpleSend/SimpleSendModal.qml b/ui/app/AppLayouts/Wallet/popups/simpleSend/SimpleSendModal.qml
@@ -455,6 +455,13 @@ StatusDialog {
         }
 
         readonly property string nativeTokenSymbol: Utils.getNativeTokenSymbol(root.selectedChainId)
+
+
+        readonly property var selectedNetworkEntry: ModelEntry {
+            sourceModel: root.networksModel
+            key: "chainId"
+            value: root.selectedChainId
+        }
     }
 
     width: 556
@@ -752,6 +759,8 @@ StatusDialog {
                         fiatFees: root.estimatedFiatFees
                         loading: root.routesLoading && root.allValuesFilledCorrectly
                         error: d.errNotEnoughEth
+                        networkName: !!d.selectedNetworkEntry.item && d.selectedNetworkEntry.available ?
+                                         d.selectedNetworkEntry.item.chainName: ""
                     }
                     visible: root.allValuesFilledCorrectly
                 }
diff --git a/vendor/status-go b/vendor/status-go
@@ -1 +1 @@
-Subproject commit efeaaa5531392510a781c4a1e8a0931fd3afb2ba
+Subproject commit cd63d546eed4d620f299878c75d4b6240364b771

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ SplitView {`
`24`	`24`	`fiatFees: qsTr("1.45 EUR")`
`25`	`25`	`loading: loadingCheckbox.checked`
`26`	`26`	`error: errorCheckbox.checked`
	`27`	`+ networkName: "Mainnet"`
`27`	`28`	`}`
`28`	`29`	`}`
`29`	`30`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ QtObject {`
`91`	`91`	`if (estimatedTime >= 60) {`
`92`	`92`	`return qsTr(">60s")`
`93`	`93`	`}`
`94`		`- return qsTr("~%1").arg(estimatedTime)`
	`94`	`+ return qsTr("~%1s").arg(estimatedTime)`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`function getRouterErrorBasedOnCode(code) {`
Original file line number	Diff line number	Diff line change
`@@ -455,6 +455,13 @@ StatusDialog {`
`455`	`455`	`}`
`456`	`456`
`457`	`457`	`readonly property string nativeTokenSymbol: Utils.getNativeTokenSymbol(root.selectedChainId)`
	`458`	`+`
	`459`	`+`
	`460`	`+ readonly property var selectedNetworkEntry: ModelEntry {`
	`461`	`+ sourceModel: root.networksModel`
	`462`	`+ key: "chainId"`
	`463`	`+ value: root.selectedChainId`
	`464`	`+ }`
`458`	`465`	`}`
`459`	`466`
`460`	`467`	`width: 556`
`@@ -752,6 +759,8 @@ StatusDialog {`
`752`	`759`	`fiatFees: root.estimatedFiatFees`
`753`	`760`	`loading: root.routesLoading && root.allValuesFilledCorrectly`
`754`	`761`	`error: d.errNotEnoughEth`
	`762`	`+ networkName: !!d.selectedNetworkEntry.item && d.selectedNetworkEntry.available ?`
	`763`	`+ d.selectedNetworkEntry.item.chainName: ""`
`755`	`764`	`}`
`756`	`765`	`visible: root.allValuesFilledCorrectly`
`757`	`766`	`}`