From 367d982f50613ebc66ecf9276e74fa00b7eb1fc5 Mon Sep 17 00:00:00 2001
From: Tomek Marciniak <tmarciniakm@gmail.com>
Date: Tue, 6 Aug 2024 16:15:53 +0200
Subject: [PATCH] fix(txs): fix pending transactions urls in tx list

---
 apps/extension/package.json                   |  2 +-
 packages/features/package.json                |  2 +-
 .../src/error-renderer/views/error.tsx        | 18 ++++++++----
 .../src/transactions/routes/transactions.tsx  |  4 +--
 .../providers/src/unified-providers/types.ts  |  1 +
 .../chain-history-provider.test.ts            |  1 +
 .../unified-provider.test.ts                  |  1 +
 packages/vault/src/network-info/default.ts    | 29 ++++++-------------
 .../network-info/network-info-store.test.ts   |  3 ++
 9 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/apps/extension/package.json b/apps/extension/package.json
index 57eaaf09..705250da 100644
--- a/apps/extension/package.json
+++ b/apps/extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@palladxyz/extension",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/packages/features/package.json b/packages/features/package.json
index 892d798e..8b9973ab 100644
--- a/packages/features/package.json
+++ b/packages/features/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@palladxyz/features",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "",
   "type": "module",
   "module": "dist/index.js",
diff --git a/packages/features/src/error-renderer/views/error.tsx b/packages/features/src/error-renderer/views/error.tsx
index c6e07a90..fe7b6c67 100644
--- a/packages/features/src/error-renderer/views/error.tsx
+++ b/packages/features/src/error-renderer/views/error.tsx
@@ -13,12 +13,20 @@ export const ErrorView = ({ error, resetErrorBoundary }: FallbackProps) => {
   }
   return (
     <div className="flex flex-1 flex-col justify-center items-center min-h-screen w-full p-8">
-      <div className="card bg-secondary w-full">
-        <div className="card-body gap-4 p-4">
-          <h1 className="card-title">Woops</h1>
-          <p>An error happened.</p>
+      <div className="card flex flex-col flex-1 bg-secondary w-full">
+        <div className="card-body flex-1 flex flex-col gap-4 p-4">
+          <h1 className="text-xl">Woops</h1>
+          <p className="flex-[0] text-gray-400">An error happened.</p>
+          <a
+            href="https://get.pallad.co/status"
+            target="_blank"
+            rel="noopener noreferrer"
+            className="underline"
+          >
+            Check services status.
+          </a>
           <textarea
-            className="textarea textarea-bordered rounded-xl resize-none h-64"
+            className="textarea textarea-bordered rounded-xl resize-none flex-1"
             value={stringifiedError}
             readOnly
           />
diff --git a/packages/features/src/transactions/routes/transactions.tsx b/packages/features/src/transactions/routes/transactions.tsx
index e093a7db..b1063d8f 100644
--- a/packages/features/src/transactions/routes/transactions.tsx
+++ b/packages/features/src/transactions/routes/transactions.tsx
@@ -19,11 +19,11 @@ export const TransactionsRoute = () => {
       .filter((hash) => !transactions?.map((tx) => tx.hash).includes(hash)),
   )
   const openPendingTransactions = () => {
-    const url = currentNetworkInfo.explorer.accountUrl.replace(
+    const url = currentNetworkInfo.explorer.pendingTransactionsUrl.replace(
       "{publicKey}",
       publicKey,
     )
-    window.open(`${url}/txs`, "_blank")?.focus()
+    window.open(url, "_blank")?.focus()
   }
   // biome-ignore lint: only run on first render
   useEffect(() => {
diff --git a/packages/providers/src/unified-providers/types.ts b/packages/providers/src/unified-providers/types.ts
index caa73e13..d12195a8 100644
--- a/packages/providers/src/unified-providers/types.ts
+++ b/packages/providers/src/unified-providers/types.ts
@@ -11,6 +11,7 @@ export type ProviderConfig = {
   explorer: {
     transactionUrl: string
     accountUrl: string
+    pendingTransactionsUrl: string
   }
   networkName: string
   networkType: "testnet" | "mainnet"
diff --git a/packages/providers/test/unified-providers/individual-providers/chain-history-provider.test.ts b/packages/providers/test/unified-providers/individual-providers/chain-history-provider.test.ts
index ebc55c5d..71b3dd8c 100644
--- a/packages/providers/test/unified-providers/individual-providers/chain-history-provider.test.ts
+++ b/packages/providers/test/unified-providers/individual-providers/chain-history-provider.test.ts
@@ -29,6 +29,7 @@ describe.skip("Unified Chain History Provider (Functional)", () => {
         explorer: {
           accountUrl: "",
           transactionUrl: "",
+          pendingTransactionsUrl: "",
         },
         networkName: "Devnet",
         chainId: "...",
diff --git a/packages/providers/test/unified-providers/unified-provider.test.ts b/packages/providers/test/unified-providers/unified-provider.test.ts
index 72b4ce19..1590daa0 100644
--- a/packages/providers/test/unified-providers/unified-provider.test.ts
+++ b/packages/providers/test/unified-providers/unified-provider.test.ts
@@ -36,6 +36,7 @@ describe("Unified Chain provider", () => {
         explorer: {
           accountUrl: "",
           transactionUrl: "",
+          pendingTransactionsUrl: "",
         },
         networkName: "Devnet",
         chainId: "...",
diff --git a/packages/vault/src/network-info/default.ts b/packages/vault/src/network-info/default.ts
index 3685f412..95c26aa8 100644
--- a/packages/vault/src/network-info/default.ts
+++ b/packages/vault/src/network-info/default.ts
@@ -21,10 +21,12 @@ export const DEFAULT_NETWORK_INFO: Record<NetworkName, ProviderConfig> = {
     explorer: {
       transactionUrl: "https://minascan.io/devnet/tx/{hash}/txInfo",
       accountUrl: "https://minascan.io/devnet/account/{publicKey}",
+      pendingTransactionsUrl:
+        "https://minascan.io/devnet/txs/pending-txs?search={publicKey}",
     },
     networkName: "Devnet",
     networkType: "testnet",
-    chainId: "...", // todo: fetch chainId from a provider
+    chainId: "",
   },
   Mainnet: {
     nodeEndpoint: {
@@ -40,10 +42,12 @@ export const DEFAULT_NETWORK_INFO: Record<NetworkName, ProviderConfig> = {
     explorer: {
       transactionUrl: "https://minascan.io/mainnet/tx/{hash}/txInfo",
       accountUrl: "https://minascan.io/mainnet/account/{publicKey}",
+      pendingTransactionsUrl:
+        "https://minascan.io/mainnet/txs/pending-txs?search={publicKey}",
     },
     networkName: "Mainnet",
     networkType: "mainnet",
-    chainId: "...", // todo: fetch chainId from a provider
+    chainId: "",
   },
   ZekoDevNet: {
     nodeEndpoint: {
@@ -57,26 +61,11 @@ export const DEFAULT_NETWORK_INFO: Record<NetworkName, ProviderConfig> = {
     explorer: {
       transactionUrl: "https://zekoscan.io/devnet/tx/{hash}/txInfo",
       accountUrl: "https://zekoscan.io/devnet/account/{publicKey}",
+      pendingTransactionsUrl:
+        "https://zekoscan.io/devnet/txs/user-txs?search={publicKey}",
     },
     networkName: "ZekoDevNet",
     networkType: "testnet",
-    chainId: "...", // todo: fetch chainId from a provider
-  },
-  OptimismSepolia: {
-    nodeEndpoint: {
-      providerName: "evm-rpc",
-      url: "wss://optimism-sepolia-rpc.publicnode.com",
-    },
-    archiveNodeEndpoint: {
-      providerName: "evm-explorer",
-      url: "https://api-sepolia-optimism.etherscan.io/",
-    },
-    explorer: {
-      transactionUrl: "",
-      accountUrl: "",
-    },
-    networkName: "OptimismSepolia",
-    networkType: "testnet",
-    chainId: "...", // todo: fetch chainId from a provider
+    chainId: "",
   },
 }
diff --git a/packages/vault/test/network-info/network-info-store.test.ts b/packages/vault/test/network-info/network-info-store.test.ts
index 7554d56a..23265a61 100644
--- a/packages/vault/test/network-info/network-info-store.test.ts
+++ b/packages/vault/test/network-info/network-info-store.test.ts
@@ -33,6 +33,7 @@ describe("CredentialStore", () => {
       explorer: {
         accountUrl: "",
         transactionUrl: "",
+        pendingTransactionsUrl: "",
       },
       networkName: networkNameMainnet,
       networkType: networkType,
@@ -50,6 +51,7 @@ describe("CredentialStore", () => {
       explorer: {
         accountUrl: "",
         transactionUrl: "",
+        pendingTransactionsUrl: "",
       },
       networkName: networkNameDevnet,
       networkType: networkType,
@@ -67,6 +69,7 @@ describe("CredentialStore", () => {
       explorer: {
         accountUrl: "",
         transactionUrl: "",
+        pendingTransactionsUrl: "",
       },
       networkName: networkNameRopsten,
       networkType: networkType,