fix(wallet): Block Explorer URL

brave · Apr 26, 2022 · ca9e7ad · ca9e7ad
1 parent 2089660
commit ca9e7ad
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 22 deletions.
diff --git a/components/brave_wallet_ui/common/hooks/use-transactions-network.ts b/components/brave_wallet_ui/common/hooks/use-transactions-network.ts
@@ -0,0 +1,17 @@
+import * as React from 'react'
+import { useSelector } from 'react-redux'
+import { BraveWallet, WalletState } from '../../constants/types'
+import { getNetworkFromTXDataUnion } from '../../utils/network-utils'
+
+export const useTransactionsNetwork = (transaction: BraveWallet.TransactionInfo) => {
+  // redux
+  const {
+    defaultNetworks, selectedNetwork
+  } = useSelector(({ wallet }: { wallet: WalletState }) => wallet)
+
+  const txNetwork = React.useMemo(() => {
+    return getNetworkFromTXDataUnion(transaction.txDataUnion, defaultNetworks, selectedNetwork)
+  }, [defaultNetworks, transaction, selectedNetwork])
+
+  return txNetwork
+}
diff --git a/components/brave_wallet_ui/components/desktop/portfolio-transaction-item/index.tsx b/components/brave_wallet_ui/components/desktop/portfolio-transaction-item/index.tsx
@@ -18,6 +18,7 @@ import { copyToClipboard } from '../../../utils/copy-to-clipboard'
 // Hooks
 import { useExplorer, useTransactionParser } from '../../../common/hooks'
 import { SwapExchangeProxy } from '../../../common/hooks/address-labels'
+import { useTransactionsNetwork } from '../../../common/hooks/use-transactions-network'
 
 // Styled Components
 import {
@@ -67,7 +68,6 @@ const PortfolioTransactionItem = (props: Props) => {
   const {
     transaction,
     account,
-    selectedNetwork,
     visibleTokens,
     transactionSpotPrices,
     displayAccountName,
@@ -81,7 +81,9 @@ const PortfolioTransactionItem = (props: Props) => {
   } = props
   const [showTransactionPopup, setShowTransactionPopup] = React.useState<boolean>(false)
 
-  const parseTransaction = useTransactionParser(selectedNetwork, accounts, transactionSpotPrices, visibleTokens)
+  const transactionsNetwork = useTransactionsNetwork(transaction)
+
+  const parseTransaction = useTransactionParser(transactionsNetwork, accounts, transactionSpotPrices, visibleTokens)
   const transactionDetails = React.useMemo(
     () => parseTransaction(transaction),
     [transaction]
@@ -105,7 +107,7 @@ const PortfolioTransactionItem = (props: Props) => {
     }
   }
 
-  const onClickViewOnBlockExplorer = useExplorer(selectedNetwork)
+  const onClickViewOnBlockExplorer = useExplorer(transactionsNetwork)
 
   const onClickCopyTransactionHash = (transactionHash: string) => {
     copyToClipboard(transactionHash)
@@ -324,8 +326,8 @@ const PortfolioTransactionItem = (props: Props) => {
               <TransactionFeeTooltipBody>
                 {
                   new Amount(transactionDetails.gasFee)
-                    .divideByDecimals(selectedNetwork.decimals)
-                    .formatAsAsset(6, selectedNetwork.symbol)
+                    .divideByDecimals(transactionsNetwork.decimals)
+                    .formatAsAsset(6, transactionsNetwork.symbol)
                 }
               </TransactionFeeTooltipBody>
               <TransactionFeeTooltipBody>

diff --git a/components/brave_wallet_ui/components/extension/confirm-transaction-panel/index.tsx b/components/brave_wallet_ui/components/extension/confirm-transaction-panel/index.tsx
@@ -20,6 +20,7 @@ import Amount from '../../../utils/amount'
 
 // Hooks
 import { usePricing, useTransactionParser, useTokenInfo } from '../../../common/hooks'
+import { useTransactionsNetwork } from '../../../common/hooks/use-transactions-network'
 
 import { getLocale } from '../../../../common/locale'
 import { withPlaceholderIcon } from '../../shared'
@@ -109,7 +110,6 @@ function ConfirmTransactionPanel (props: Props) {
   const {
     siteURL,
     accounts,
-    selectedNetwork,
     transactionInfo,
     visibleTokens,
     transactionSpotPrices,
@@ -129,6 +129,8 @@ function ConfirmTransactionPanel (props: Props) {
     updateUnapprovedTransactionNonce
   } = props
 
+  const transactionsNetwork = useTransactionsNetwork(transactionInfo)
+
   const transactionGasEstimates = transactionInfo.txDataUnion.ethTxData1559?.gasEstimation
 
   const [maxPriorityPanel, setMaxPriorityPanel] = React.useState<MaxPriorityPanels>(MaxPriorityPanels.setSuggested)
@@ -146,13 +148,13 @@ function ConfirmTransactionPanel (props: Props) {
   const [showAdvancedTransactionSettings, setShowAdvancedTransactionSettings] = React.useState<boolean>(false)
 
   const { findAssetPrice } = usePricing(transactionSpotPrices)
-  const parseTransaction = useTransactionParser(selectedNetwork, accounts, transactionSpotPrices, visibleTokens, fullTokenList)
+  const parseTransaction = useTransactionParser(transactionsNetwork, accounts, transactionSpotPrices, visibleTokens, fullTokenList)
   const transactionDetails = parseTransaction(transactionInfo)
 
   const {
     onFindTokenInfoByContractAddress,
     foundTokenInfoByContractAddress
-  } = useTokenInfo(getBlockchainTokenInfo, visibleTokens, fullTokenList, selectedNetwork)
+  } = useTokenInfo(getBlockchainTokenInfo, visibleTokens, fullTokenList, transactionsNetwork)
 
   React.useEffect(() => {
     const interval = setInterval(() => {
@@ -266,8 +268,8 @@ function ConfirmTransactionPanel (props: Props) {
       <EditGas
         transactionInfo={transactionInfo}
         onCancel={onToggleEditGas}
-        networkSpotPrice={findAssetPrice(selectedNetwork.symbol)}
-        selectedNetwork={selectedNetwork}
+        networkSpotPrice={findAssetPrice(transactionsNetwork.symbol)}
+        selectedNetwork={transactionsNetwork}
         baseFeePerGas={baseFeePerGas}
         suggestedMaxPriorityFeeChoices={suggestedMaxPriorityFeeChoices}
         updateUnapprovedTransactionGasFields={updateUnapprovedTransactionGasFields}
@@ -306,7 +308,7 @@ function ConfirmTransactionPanel (props: Props) {
   return (
     <StyledWrapper>
       <TopRow>
-        <NetworkText>{reduceNetworkDisplayName(selectedNetwork.chainName)}</NetworkText>
+        <NetworkText>{reduceNetworkDisplayName(transactionsNetwork.chainName)}</NetworkText>
         {transactionInfo.txType === BraveWallet.TransactionType.ERC20Approve &&
           <AddressAndOrb>
             <AddressText>{reduceAddress(transactionDetails.recipient)}</AddressText>
@@ -337,7 +339,7 @@ function ConfirmTransactionPanel (props: Props) {
           {transactionDetails.isApprovalUnlimited &&
             <WarningBox>
               <WarningTitleRow>
-                <WarningIcon/>
+                <WarningIcon />
                 <WarningTitle>
                   {getLocale('braveWalletAllowSpendUnlimitedWarningTitle')}
                 </WarningTitle>
@@ -361,7 +363,7 @@ function ConfirmTransactionPanel (props: Props) {
           <TransactionTypeText>{transactionTitle}</TransactionTypeText>
           {(transactionInfo.txType === BraveWallet.TransactionType.ERC721TransferFrom ||
             transactionInfo.txType === BraveWallet.TransactionType.ERC721SafeTransferFrom) &&
-            <AssetIconWithPlaceholder asset={transactionDetails.erc721BlockchainToken} network={selectedNetwork} />
+            <AssetIconWithPlaceholder asset={transactionDetails.erc721BlockchainToken} network={transactionsNetwork} />
           }
           <TransactionAmountBig>
             {transactionInfo.txType === BraveWallet.TransactionType.ERC721TransferFrom ||
@@ -394,7 +396,7 @@ function ConfirmTransactionPanel (props: Props) {
         />
 
         <AdvancedTransactionSettingsButton
-          onSubmit={ onToggleAdvancedTransactionSettings }
+          onSubmit={onToggleAdvancedTransactionSettings}
         />
       </TabRow>
       <MessageBox isDetails={selectedTab === 'details'} isApprove={transactionInfo.txType === BraveWallet.TransactionType.ERC20Approve}>
@@ -409,8 +411,8 @@ function ConfirmTransactionPanel (props: Props) {
                     <TransactionTypeText>
                       {
                         new Amount(transactionDetails.gasFee)
-                          .divideByDecimals(selectedNetwork.decimals)
-                          .formatAsAsset(6, selectedNetwork.symbol)
+                          .divideByDecimals(transactionsNetwork.decimals)
+                          .formatAsAsset(6, transactionsNetwork.symbol)
                       }
                     </TransactionTypeText>
                   </SectionRow>
@@ -439,7 +441,7 @@ function ConfirmTransactionPanel (props: Props) {
                         transactionDetails.isApprovalUnlimited
                           ? getLocale('braveWalletTransactionApproveUnlimited')
                           : new Amount(transactionDetails.valueExact)
-                              .formatAsAsset(undefined, transactionDetails.symbol)
+                            .formatAsAsset(undefined, transactionDetails.symbol)
                       }
                     </TransactionTypeText>
                     <TransactionText />
@@ -456,8 +458,8 @@ function ConfirmTransactionPanel (props: Props) {
                     <TransactionTypeText>
                       {
                         new Amount(transactionDetails.gasFee)
-                          .divideByDecimals(selectedNetwork.decimals)
-                          .formatAsAsset(6, selectedNetwork.symbol)
+                          .divideByDecimals(transactionsNetwork.decimals)
+                          .formatAsAsset(6, transactionsNetwork.symbol)
                       }
                     </TransactionTypeText>
                     <TransactionText>
@@ -479,7 +481,7 @@ function ConfirmTransactionPanel (props: Props) {
                         ? new Amount(transactionDetails.valueExact)
                           .format(undefined, true)
                         : transactionDetails.valueExact
-                      } {transactionDetails.symbol} + {new Amount(transactionDetails.gasFee).divideByDecimals(selectedNetwork.decimals).formatAsAsset(6, selectedNetwork.symbol)}
+                      } {transactionDetails.symbol} + {new Amount(transactionDetails.gasFee).divideByDecimals(transactionsNetwork.decimals).formatAsAsset(6, transactionsNetwork.symbol)}
                     </GrandTotalText>
                   </SingleRow>
                   <TransactionText

diff --git a/components/brave_wallet_ui/components/extension/transaction-list-item/index.tsx b/components/brave_wallet_ui/components/extension/transaction-list-item/index.tsx
@@ -17,6 +17,7 @@ import { mojoTimeDeltaToJSDate } from '../../../../common/mojomUtils'
 // Hooks
 import { useTransactionParser } from '../../../common/hooks'
 import { SwapExchangeProxy } from '../../../common/hooks/address-labels'
+import { useTransactionsNetwork } from '../../../common/hooks/use-transactions-network'
 
 // Styled Components
 import {
@@ -53,15 +54,16 @@ export interface Props {
 const TransactionsListItem = (props: Props) => {
   const {
     transaction,
-    selectedNetwork,
     visibleTokens,
     transactionSpotPrices,
     accounts,
     defaultCurrencies,
     onSelectTransaction
   } = props
 
-  const parseTransaction = useTransactionParser(selectedNetwork, accounts, transactionSpotPrices, visibleTokens)
+  const transactionsNetwork = useTransactionsNetwork(transaction)
+
+  const parseTransaction = useTransactionParser(transactionsNetwork, accounts, transactionSpotPrices, visibleTokens)
   const transactionDetails = React.useMemo(
     () => parseTransaction(transaction),
     [transaction]

diff --git a/components/brave_wallet_ui/utils/network-utils.ts b/components/brave_wallet_ui/utils/network-utils.ts
@@ -72,3 +72,8 @@ export const getCoinFromTxDataUnion = (txDataUnion: BraveWallet.TxDataUnion): Br
   if (txDataUnion.solanaTxData) { return BraveWallet.CoinType.SOL }
   return BraveWallet.CoinType.ETH
 }
+
+export const getNetworkFromTXDataUnion = (txDataUnion: BraveWallet.TxDataUnion, networks: BraveWallet.NetworkInfo[], selectedNetwork: BraveWallet.NetworkInfo) => {
+  const coin = getCoinFromTxDataUnion(txDataUnion)
+  return networks.find((network) => network.coin === coin) ?? selectedNetwork
+}