From 3e1bdade10fb3c5e433c5e51b1075999f757d4da Mon Sep 17 00:00:00 2001 From: abefernan <44572727+abefernan@users.noreply.github.com> Date: Thu, 20 Apr 2023 09:16:10 +0200 Subject: [PATCH 1/5] Add var to envfiles --- .env.sample | 1 + .env.test.sample | 1 + 2 files changed, 2 insertions(+) diff --git a/.env.sample b/.env.sample index 806d1c7..7dd9f98 100644 --- a/.env.sample +++ b/.env.sample @@ -11,3 +11,4 @@ NEXT_PUBLIC_REGISTRY_NAME=cosmoshub NEXT_PUBLIC_EXPLORER_LINK_TX="https://www.mintscan.io/cosmos/txs/\${txHash}" NEXT_PUBLIC_CHAIN_DISPLAY_NAME="Cosmos Hub" NEXT_PUBLIC_MULTICHAIN=true +NEXT_PUBLIC_EXPLORER_LINK_MULTISIG=https://www.mintscan.io/cosmos/account/ diff --git a/.env.test.sample b/.env.test.sample index 5d5abb4..22fb8ad 100644 --- a/.env.test.sample +++ b/.env.test.sample @@ -11,3 +11,4 @@ NEXT_PUBLIC_REGISTRY_NAME=junotestnet NEXT_PUBLIC_EXPLORER_LINK_TX="https://testnet.mintscan.io/juno-testnet/txs/\${txHash}" NEXT_PUBLIC_CHAIN_DISPLAY_NAME="Juno Testnet" NEXT_PUBLIC_MULTICHAIN=true +NEXT_PUBLIC_EXPLORER_LINK_MULTISIG=https://testnet.mintscan.io/juno-testnet/account/ From 6213e1badea37690d7325ef2be7c0e5cd4bb78b9 Mon Sep 17 00:00:00 2001 From: abefernan <44572727+abefernan@users.noreply.github.com> Date: Thu, 20 Apr 2023 09:16:23 +0200 Subject: [PATCH 2/5] Add View explorer button like in tx view --- pages/multi/[address]/index.tsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pages/multi/[address]/index.tsx b/pages/multi/[address]/index.tsx index 6fb70a9..16a8e2b 100644 --- a/pages/multi/[address]/index.tsx +++ b/pages/multi/[address]/index.tsx @@ -81,13 +81,13 @@ const Multipage = () => { -

- {router.query.address ? ( - - ) : ( - "No Address" - )} -

+

{multisigAddress ? : "No Address"}

+ {multisigAddress ? ( + + ) : null}
{pubkey && ( Date: Fri, 21 Apr 2023 22:26:51 +0200 Subject: [PATCH 3/5] Rename and reorder env var --- .env.sample | 2 +- .env.test.sample | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.sample b/.env.sample index 7dd9f98..8450d9b 100644 --- a/.env.sample +++ b/.env.sample @@ -9,6 +9,6 @@ NEXT_PUBLIC_CHAIN_ID=cosmoshub-4 NEXT_PUBLIC_ADDRESS_PREFIX=cosmos NEXT_PUBLIC_REGISTRY_NAME=cosmoshub NEXT_PUBLIC_EXPLORER_LINK_TX="https://www.mintscan.io/cosmos/txs/\${txHash}" +NEXT_PUBLIC_EXPLORER_LINK_ACCOUNT="https://www.mintscan.io/cosmos/account/\${address}" NEXT_PUBLIC_CHAIN_DISPLAY_NAME="Cosmos Hub" NEXT_PUBLIC_MULTICHAIN=true -NEXT_PUBLIC_EXPLORER_LINK_MULTISIG=https://www.mintscan.io/cosmos/account/ diff --git a/.env.test.sample b/.env.test.sample index 22fb8ad..dc29926 100644 --- a/.env.test.sample +++ b/.env.test.sample @@ -9,6 +9,6 @@ NEXT_PUBLIC_CHAIN_ID=uni-6 NEXT_PUBLIC_ADDRESS_PREFIX=juno NEXT_PUBLIC_REGISTRY_NAME=junotestnet NEXT_PUBLIC_EXPLORER_LINK_TX="https://testnet.mintscan.io/juno-testnet/txs/\${txHash}" +NEXT_PUBLIC_EXPLORER_LINK_ACCOUNT="https://testnet.mintscan.io/juno-testnet/account/\${address}" NEXT_PUBLIC_CHAIN_DISPLAY_NAME="Juno Testnet" NEXT_PUBLIC_MULTICHAIN=true -NEXT_PUBLIC_EXPLORER_LINK_MULTISIG=https://testnet.mintscan.io/juno-testnet/account/ From 1f1039eb3e85400fc8d1f594853e9e6c39a9570a Mon Sep 17 00:00:00 2001 From: abefernan <44572727+abefernan@users.noreply.github.com> Date: Fri, 21 Apr 2023 22:27:13 +0200 Subject: [PATCH 4/5] Add address parser for links --- lib/displayHelpers.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/displayHelpers.ts b/lib/displayHelpers.ts index 1155cc9..4e8a12f 100644 --- a/lib/displayHelpers.ts +++ b/lib/displayHelpers.ts @@ -152,6 +152,17 @@ const explorerLinkTx = (link: string, hash: string) => { return null; }; +/** + * Returns a link to an account in an explorer if an explorer is configured + * for accounts. Returns null otherwise. + */ +const explorerLinkAccount = (link: string, address: string) => { + if (link && link.includes("${address}")) { + return link.replace("${address}", address); + } + return null; +}; + export { ellideMiddle, printableCoin, @@ -161,4 +172,5 @@ export { examplePubkey, checkAddress, explorerLinkTx, + explorerLinkAccount, }; From 1259c526eeffe9b265ffc20cbceb947984bb1039 Mon Sep 17 00:00:00 2001 From: abefernan <44572727+abefernan@users.noreply.github.com> Date: Fri, 21 Apr 2023 22:27:44 +0200 Subject: [PATCH 5/5] Use explorerLinkAccount() --- pages/multi/[address]/index.tsx | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pages/multi/[address]/index.tsx b/pages/multi/[address]/index.tsx index 16a8e2b..c058e60 100644 --- a/pages/multi/[address]/index.tsx +++ b/pages/multi/[address]/index.tsx @@ -16,6 +16,7 @@ import Button from "../../../components/inputs/Button"; import Page from "../../../components/layout/Page"; import StackableContainer from "../../../components/layout/StackableContainer"; import { useAppContext } from "../../../context/AppContext"; +import { explorerLinkAccount } from "../../../lib/displayHelpers"; import { getMultisigAccount } from "../../../lib/multisigHelpers"; type TxView = null | "send" | "delegate" | "undelegate" | "redelegate" | "claimRewards"; @@ -76,18 +77,18 @@ const Multipage = () => { assert(state.chain.addressPrefix, "address prefix missing"); + const explorerHref = explorerLinkAccount( + process.env.NEXT_PUBLIC_EXPLORER_LINK_ACCOUNT || "", + multisigAddress, + ); + return (

{multisigAddress ? : "No Address"}

- {multisigAddress ? ( - - ) : null} + {explorerHref ? : null}
{pubkey && (