fix(@desktop/wallet): Send Modal doesn't fill available height and Dr…

…op Shadow missing in Send Modal Footer Also fixed a crash found while fixing the above bugs fixed #7133, #7134
status-im · Sep 19, 2022 · 8c4ce7b · 8c4ce7b
1 parent 8b02d8d
commit 8c4ce7b
Show file tree

Hide file tree

Showing 6 changed files with 233 additions and 233 deletions.
diff --git a/src/app_service/service/transaction/service.nim b/src/app_service/service/transaction/service.nim
@@ -130,7 +130,7 @@ QtObject:
   proc confirmTransactionStatus(self: Service, pendingTransactions: JsonNode) =
     for trx in pendingTransactions.getElems():
       let transactionReceipt = self.getTransactionReceipt(trx["network_id"].getInt, trx["hash"].getStr)
-      if transactionReceipt.kind != JNull:
+      if transactionReceipt != nil and transactionReceipt.kind != JNull:
         self.deletePendingTransaction(trx["network_id"].getInt, trx["hash"].getStr)
         let ev = TransactionMinedArgs(
                   data: trx["additionalData"].getStr,

diff --git a/ui/imports/shared/controls/AssetAndAmountInput.qml b/ui/imports/shared/controls/AssetAndAmountInput.qml
@@ -172,7 +172,7 @@ Item {
          tokenAssetSourceFn: function (symbol) {
              return symbol ? Style.png("tokens/" + symbol) : defaultToken
          }
-         searchTokenSymbolByAddress: function (address) {
+         searchTokenSymbolByAddressFn: function (address) {
              if(popup.selectedAccount) {
                  return popup.selectedAccount.findTokenSymbolByAddress(address)
              }

diff --git a/ui/imports/shared/panels/StatusAssetSelector.qml b/ui/imports/shared/panels/StatusAssetSelector.qml
@@ -23,7 +23,7 @@ Item {
     property var tokenAssetSourceFn: function (symbol) {
         return ""
     }
-    property var searchTokenSymbolByAddress: function (address) {
+    property var searchTokenSymbolByAddressFn: function (address) {
         return ""
     }
 
@@ -74,7 +74,7 @@ Item {
             filters: [
                 ExpressionFilter {
                     expression: {
-                        var tokenSymbolByAddress = searchTokenSymbolByAddress(d.searchString)
+                        var tokenSymbolByAddress = searchTokenSymbolByAddressFn(d.searchString)
                         return symbol.startsWith(d.searchString.toUpperCase()) || name.toUpperCase().startsWith(d.searchString.toUpperCase()) || (tokenSymbolByAddress!=="" && symbol.startsWith(tokenSymbolByAddress))
                     }
                 }