GA-fix: fixes bug when trying to open the transaction details, a blan…

…k page appears with a "Return to Home" button
PelagusWallet · May 30, 2024 · 7ad885a · 7ad885a
1 parent c3d2917
commit 7ad885a
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 16 deletions.
diff --git a/background/main.ts b/background/main.ts
@@ -751,6 +751,8 @@ export default class Main extends BaseService<never> {
       addressNetwork.network,
       txHash
     )
+    if (!transaction) return
+
     const enrichedTransaction = await this.enrichmentService.enrichTransaction(
       transaction,
       2
@@ -1608,6 +1610,8 @@ export default class Main extends BaseService<never> {
       addressNetwork.network,
       txHash
     )
+    if (!transaction) return []
+
     const enrichedTransaction = await this.enrichmentService.enrichTransaction(
       transaction,
       2

diff --git a/background/services/chain/index.ts b/background/services/chain/index.ts
@@ -1060,23 +1060,28 @@ export default class ChainService extends BaseService<Events> {
   async getTransaction(
     network: EVMNetwork,
     txHash: HexString
-  ): Promise<AnyEVMTransaction> {
-    const cachedTx = await this.db.getTransaction(network, txHash)
-    // If tx is cached and already included in a block, don't need to query provider
-    if (cachedTx && cachedTx.blockHash != undefined) return cachedTx
+  ): Promise<AnyEVMTransaction | null> {
+    const provider = this.providerForNetworkOrThrow(network)
+    const gethResult = await provider.getTransaction(txHash)
 
-    const gethResult = await this.providerForNetworkOrThrow(
-      network
-    ).getTransaction(txHash)
-    const newTransaction = transactionFromEthersTransaction(gethResult, network)
+    if (gethResult) {
+      const newTransaction = transactionFromEthersTransaction(
+        gethResult,
+        network
+      )
 
-    if (!newTransaction.blockHash && !newTransaction.blockHeight) {
-      this.subscribeToTransactionConfirmation(network, newTransaction)
+      if (!newTransaction.blockHash && !newTransaction.blockHeight) {
+        this.subscribeToTransactionConfirmation(network, newTransaction)
+      }
+
+      this.saveTransaction(newTransaction, "local")
+      return newTransaction
     }
 
-    // TODO proper provider string
-    this.saveTransaction(newTransaction, "local")
-    return newTransaction
+    const cachedTx = await this.db.getTransaction(network, txHash)
+    if (cachedTx) return cachedTx
+
+    return null
   }
 
   /**

diff --git a/ui/components/Wallet/WalletActivityDetails.tsx b/ui/components/Wallet/WalletActivityDetails.tsx
@@ -193,7 +193,7 @@ export default function WalletActivityDetails(
         />
       </div>
       <ul>
-        {details.length ? (
+        {details?.length ? (
           <></>
         ) : (
           Array.from({ length: 7 }).map(() => (
@@ -203,7 +203,7 @@ export default function WalletActivityDetails(
             />
           ))
         )}
-        {details.map(({ assetIconUrl, label, value }) => {
+        {details?.map(({ assetIconUrl, label, value }) => {
           return (
             <DetailRowItem
               key={label}

diff --git a/ui/pages/SingleAsset.tsx b/ui/pages/SingleAsset.tsx
@@ -40,7 +40,9 @@ const MAX_SYMBOL_LENGTH = 10
 export default function SingleAsset(): ReactElement {
   const { t } = useTranslation()
   const location = useLocation<AnyAsset>()
-  const locationAsset = location.state
+  const currentAccount = useBackgroundSelector(selectCurrentAccount)
+  const locationAsset = location.state ?? currentAccount.network.baseAsset
+
   const { symbol } = locationAsset
   const contractAddress =
     "contractAddress" in locationAsset