Merge pull request #543 from cosmostation/APP-1017-FixUI

Update ExplorerBtn Title / token search by contract
cosmostation · Nov 19, 2024 · 2ec4c24 · 2ec4c24
2 parents 22bf103 + a5d2a50
commit 2ec4c24
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/Cosmostation/Controller/Main/GenTx/CommonTransferResult.swift b/Cosmostation/Controller/Main/GenTx/CommonTransferResult.swift
@@ -128,8 +128,13 @@ class CommonTransferResult: BaseVC, AddressBookDelegate {
 
         } else if (txStyle == .COSMOS_STYLE) {
             successMsgLabel.text = cosmosBroadcastTxResponse?.txhash
-            successExplorerBtn.setTitle("Check in Mintscan", for: .normal)
-            failExplorerBtn.setTitle("Check in Mintscan", for: .normal)
+            if fromChain.isSupportMintscan() {
+                successExplorerBtn.setTitle("Check in Mintscan", for: .normal)
+                failExplorerBtn.setTitle("Check in Mintscan", for: .normal)
+            } else {
+                successExplorerBtn.setTitle("Check in Explorer", for: .normal)
+                failExplorerBtn.setTitle("Check in Explorer", for: .normal)
+            }
         }
     }
 

diff --git a/Cosmostation/Controller/Sheet/SelectDisplayTokenListSheet.swift b/Cosmostation/Controller/Sheet/SelectDisplayTokenListSheet.swift
@@ -76,11 +76,11 @@ class SelectDisplayTokenListSheet: BaseVC, UISearchBarDelegate{
     func searchBar(_ searchBar: UISearchBar, textDidChange searchText: String) {
         if selectedChain.isSupportCw20() && selectedChain.isSupportErc20() {
             searchTokens = searchText.isEmpty ? allTokens.filter { $0.type == tokenType[segment.selectedSegmentIndex] } : allTokens.filter({ $0.type == tokenType[segment.selectedSegmentIndex] }).filter { token in
-                return token.symbol!.range(of: searchText, options: .caseInsensitive, range: nil, locale: nil) != nil
+                return token.symbol!.range(of: searchText, options: .caseInsensitive, range: nil, locale: nil) != nil || token.contract?.range(of: searchText, options: .caseInsensitive) != nil
             }
         } else {
             searchTokens = searchText.isEmpty ? allTokens : allTokens.filter { token in
-                return token.symbol!.range(of: searchText, options: .caseInsensitive, range: nil, locale: nil) != nil
+                return token.symbol!.range(of: searchText, options: .caseInsensitive, range: nil, locale: nil) != nil || token.contract?.range(of: searchText, options: .caseInsensitive) != nil
             }
         }
         sheetTableView.reloadData()