From b3888dafa9e66feb0ebfb3a8951df1569246cd32 Mon Sep 17 00:00:00 2001
From: Matthew A Elder <matthew@umee.cc>
Date: Fri, 25 Feb 2022 10:18:40 -0700
Subject: [PATCH 1/3] waiting for signature implemented (shows addresses of
 signers)

---
 components/forms/TransactionSigning.js           | 16 +++++++++++++++-
 .../[address]/transaction/[transactionID].js     |  2 ++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/components/forms/TransactionSigning.js b/components/forms/TransactionSigning.js
index 3605b516..840bc702 100644
--- a/components/forms/TransactionSigning.js
+++ b/components/forms/TransactionSigning.js
@@ -7,7 +7,7 @@ import { useAppContext } from "../../context/AppContext";
 import Button from "../inputs/Button";
 import HashView from "../dataViews/HashView";
 import StackableContainer from "../layout/StackableContainer";
-import { AminoTypes } from "@cosmjs/stargate";
+import { pubkeyToAddress } from "@cosmjs/amino";
 
 const TransactionSigning = (props) => {
   const { state } = useAppContext();
@@ -105,6 +105,20 @@ const TransactionSigning = (props) => {
       )}
       <h2>Current Signers</h2>
       <StackableContainer lessPadding lessMargin lessRadius>
+        {props.accountOnChain
+          ? props.accountOnChain.pubkey.value.pubkeys.map((pubkey, i) => (
+              <StackableContainer lessPadding lessRadius lessMargin key={i}>
+                {props.signatures.find(
+                  (s) => s.address === pubkeyToAddress(pubkey, state.chain.addressPrefix),
+                ) ? (
+                  <span>✅ Signature received</span>
+                ) : (
+                  <span>⌛ Waiting for signature</span>
+                )}
+                <HashView hash={pubkeyToAddress(pubkey, state.chain.addressPrefix)} />
+              </StackableContainer>
+            ))
+          : null}
         {props.signatures.map((signature, i) => (
           <StackableContainer lessPadding lessRadius lessMargin key={`${signature.address}_${i}`}>
             <HashView hash={signature.address} />
diff --git a/pages/multi/[address]/transaction/[transactionID].js b/pages/multi/[address]/transaction/[transactionID].js
index a387095d..b4eb2b70 100644
--- a/pages/multi/[address]/transaction/[transactionID].js
+++ b/pages/multi/[address]/transaction/[transactionID].js
@@ -76,6 +76,7 @@ const transactionPage = ({
       const client = await StargateClient.connect(state.chain.nodeAddress);
       const tempHoldings = await client.getBalance(address, state.chain.denom);
       const tempAccountOnChain = await getMultisigAccount(address, client);
+      console.log("MULTI", tempAccountOnChain);
       setHoldings(tempHoldings);
       setAccountOnChain(tempAccountOnChain);
     } catch (error) {
@@ -146,6 +147,7 @@ const transactionPage = ({
         {!transactionHash && (
           <TransactionSigning
             tx={txInfo}
+            accountOnChain={accountOnChain}
             transactionID={transactionID}
             signatures={currentSignatures}
             addSignature={addSignature}

From 68928282c37b2c239ae83e7bacd1c8425deda859 Mon Sep 17 00:00:00 2001
From: Matthew A Elder <matthew@umee.cc>
Date: Fri, 25 Feb 2022 10:37:29 -0700
Subject: [PATCH 2/3] validation++ cant sign with wrong sig

---
 components/forms/TransactionSigning.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/components/forms/TransactionSigning.js b/components/forms/TransactionSigning.js
index 840bc702..984dd778 100644
--- a/components/forms/TransactionSigning.js
+++ b/components/forms/TransactionSigning.js
@@ -32,6 +32,13 @@ const TransactionSigning = (props) => {
     window.keplr_wallet = tempWalletAccount;
   };
 
+  const isValidSigner =
+    props.accountOnChain &&
+    props.accountOnChain.pubkey.value.pubkeys.find(
+      (pubkey) =>
+        pubkeyToAddress(pubkey, state.chain.addressPrefix) === walletAccount.bech32Address,
+    );
+
   const signTransaction = async () => {
     window.keplr.defaultOptions = {
       sign: {
@@ -86,7 +93,7 @@ const TransactionSigning = (props) => {
             <p>You've signed this transaction.</p>
           </div>
         </StackableContainer>
-      ) : (
+      ) : isValidSigner ? (
         <>
           <h2>Sign this transaction</h2>
           {walletAccount ? (
@@ -95,6 +102,11 @@ const TransactionSigning = (props) => {
             <Button label="Connect Wallet" onClick={connectWallet} />
           )}
         </>
+      ) : (
+        <>
+          <h2>The connected wallet is not a valid signer</h2>
+          <h3>Try switching wallets</h3>
+        </>
       )}
       {sigError && (
         <StackableContainer lessPadding lessRadius lessMargin>

From 8cb3f3f893a71d58169e3c251ac98bc7ddc86799 Mon Sep 17 00:00:00 2001
From: Matthew A Elder <matthew@umee.cc>
Date: Fri, 25 Feb 2022 10:40:58 -0700
Subject: [PATCH 3/3] tune ui

---
 components/forms/TransactionSigning.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/components/forms/TransactionSigning.js b/components/forms/TransactionSigning.js
index 984dd778..df86c790 100644
--- a/components/forms/TransactionSigning.js
+++ b/components/forms/TransactionSigning.js
@@ -131,13 +131,6 @@ const TransactionSigning = (props) => {
               </StackableContainer>
             ))
           : null}
-        {props.signatures.map((signature, i) => (
-          <StackableContainer lessPadding lessRadius lessMargin key={`${signature.address}_${i}`}>
-            <HashView hash={signature.address} />
-          </StackableContainer>
-        ))}
-
-        {props.signatures.length === 0 && <p>No signatures yet</p>}
       </StackableContainer>
       <style jsx>{`
         p {