Update query for send screen

brave · Oct 30, 2024 · b91a414 · b91a414
1 parent 4089537
commit b91a414
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/components/brave_wallet/common/brave_wallet.mojom b/components/brave_wallet/common/brave_wallet.mojom
@@ -1017,7 +1017,7 @@ struct BlockchainToken {
   string coingecko_id = "";
   string chain_id;
   CoinType coin;
-  bool is_shielded = false; // Zcash only, markes whether asset belongs to the shielded pool.
+  bool is_shielded = false; // Zcash only, marks whether asset belongs to the shielded pool.
 };
 
 struct AllowanceInfo {

diff --git a/components/brave_wallet_ui/page/screens/send/send_screen/send_screen.tsx b/components/brave_wallet_ui/page/screens/send/send_screen/send_screen.tsx
@@ -159,18 +159,22 @@ export const SendScreen = React.memo((props: Props) => {
 
     const tokenId = query.get('tokenId')
 
+    const isShielded = query.get('isShielded') === 'true'
+
     return userVisibleTokensInfo.find((token) =>
       tokenId
         ? token.chainId === networkFromParams.chainId &&
           token.contractAddress.toLowerCase() ===
             contractOrSymbol.toLowerCase() &&
-          token.tokenId === tokenId
+          token.tokenId === tokenId &&
+          token.isShielded === isShielded
         : (token.chainId === networkFromParams.chainId &&
             token.contractAddress.toLowerCase() ===
               contractOrSymbol.toLowerCase()) ||
           (token.chainId === networkFromParams.chainId &&
             token.contractAddress === '' &&
-            token.symbol.toLowerCase() === contractOrSymbol.toLowerCase())
+            token.symbol.toLowerCase() === contractOrSymbol.toLowerCase()) &&
+          token.isShielded === isShielded
     )
   }, [userVisibleTokensInfo, query, networkFromParams])
 

diff --git a/components/brave_wallet_ui/utils/routes-utils.ts b/components/brave_wallet_ui/utils/routes-utils.ts
@@ -234,10 +234,15 @@ export const makeSendRoute = (
     token: asset.contractAddress || asset.symbol.toUpperCase(),
     account: account.accountId.uniqueKey
   }
+
+  const tokenIdQueryParams = asset.tokenId
+    ? { ...baseQueryParams, tokenId: asset.tokenId }
+    : baseQueryParams
+
   const params = new URLSearchParams(
-    asset.tokenId
-      ? { ...baseQueryParams, tokenId: asset.tokenId }
-      : baseQueryParams
+    asset.isShielded
+      ? {...tokenIdQueryParams, isShielded: 'true'}
+      : tokenIdQueryParams
   )
 
   if (isNftTab) {