Fix #7759: Send token view default token (#7763)

* Select the native asset by default, fallback to BAT token, fallback to first visible user token (sorted alphabetically) * Auto-present Select Token to Send view when opening Send.
brave · Jul 21, 2023 · 4aaecd7 · 4aaecd7
1 parent bd53681
commit 4aaecd7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Sources/BraveWallet/Crypto/BuySendSwap/SendTokenView.swift b/Sources/BraveWallet/Crypto/BuySendSwap/SendTokenView.swift
@@ -16,6 +16,7 @@ struct SendTokenView: View {
 
   @State private var isShowingScanner = false
   @State private var isShowingError = false
+  @State private var didAutoShowSelectAccountToken = false
   @State private var isShowingSelectAccountTokenView: Bool = false
 
   @ScaledMetric private var length: CGFloat = 16.0
@@ -292,6 +293,10 @@ struct SendTokenView: View {
       }
     }
     .task {
+      if !didAutoShowSelectAccountToken {
+        isShowingSelectAccountTokenView = true
+        didAutoShowSelectAccountToken = true
+      }
       sendTokenStore.update()
       await sendTokenStore.selectTokenStore.update()
     }

diff --git a/Sources/BraveWallet/Crypto/Stores/SendTokenStore.swift b/Sources/BraveWallet/Crypto/Stores/SendTokenStore.swift
@@ -247,7 +247,9 @@ public class SendTokenStore: ObservableObject {
       let allTokens = await self.blockchainRegistry.allTokens(network.chainId, coin: network.coin)
       guard !Task.isCancelled else { return }
       if selectedSendToken == nil {
-        self.selectedSendToken = userAssets.first
+        self.selectedSendToken = userAssets.first(where: { network.isNativeAsset($0) })
+        ?? userAssets.first(where: { $0.symbol.caseInsensitiveCompare("bat") == .orderedSame })
+        ?? userAssets.sorted(by: { $0.name < $1.name }).first
       }
       self.userAssets = userAssets
       self.allTokens = allTokens