From f108b017b3a32d639bc61c946ca292eff1f45b06 Mon Sep 17 00:00:00 2001
From: abefernan <44572727+abefernan@users.noreply.github.com>
Date: Mon, 24 Apr 2023 08:41:27 +0200
Subject: [PATCH 1/5] Assert accountNumber in forms

---
 components/forms/DelegationForm.tsx                   | 1 +
 components/forms/ReDelegationForm.tsx                 | 1 +
 components/forms/RewardsForm.tsx                      | 1 +
 components/forms/TransactionForm.tsx                  | 1 +
 components/forms/UnDelegationForm.tsx                 | 1 +
 pages/multi/[address]/transaction/[transactionID].tsx | 1 +
 6 files changed, 6 insertions(+)

diff --git a/components/forms/DelegationForm.tsx b/components/forms/DelegationForm.tsx
index 8cb44ab..611794a 100644
--- a/components/forms/DelegationForm.tsx
+++ b/components/forms/DelegationForm.tsx
@@ -50,6 +50,7 @@ const DelegationForm = (props: Props) => {
     const fee = calculateFee(gasLimit, gasPrice);
     const { accountOnChain } = props;
     assert(accountOnChain, "accountOnChain missing");
+    assert(accountOnChain.accountNumber, "accountNumber missing");
     return {
       accountNumber: accountOnChain.accountNumber,
       sequence: accountOnChain.sequence,
diff --git a/components/forms/ReDelegationForm.tsx b/components/forms/ReDelegationForm.tsx
index 5ada999..65c70e8 100644
--- a/components/forms/ReDelegationForm.tsx
+++ b/components/forms/ReDelegationForm.tsx
@@ -57,6 +57,7 @@ const ReDelegationForm = (props: Props) => {
     const fee = calculateFee(gasLimit, gasPrice);
     const { accountOnChain } = props;
     assert(accountOnChain, "accountOnChain missing");
+    assert(accountOnChain.accountNumber, "accountNumber missing");
     return {
       accountNumber: accountOnChain.accountNumber,
       sequence: accountOnChain.sequence,
diff --git a/components/forms/RewardsForm.tsx b/components/forms/RewardsForm.tsx
index c4a16d0..3ee2dcf 100644
--- a/components/forms/RewardsForm.tsx
+++ b/components/forms/RewardsForm.tsx
@@ -40,6 +40,7 @@ const RewardsForm = (props: Props) => {
     const fee = calculateFee(gasLimit, gasPrice);
     const { accountOnChain } = props;
     assert(accountOnChain, "accountOnChain missing");
+    assert(accountOnChain.accountNumber, "accountNumber missing");
     return {
       accountNumber: accountOnChain.accountNumber,
       sequence: accountOnChain.sequence,
diff --git a/components/forms/TransactionForm.tsx b/components/forms/TransactionForm.tsx
index 3d22d75..6fd0f6f 100644
--- a/components/forms/TransactionForm.tsx
+++ b/components/forms/TransactionForm.tsx
@@ -52,6 +52,7 @@ const TransactionForm = (props: Props) => {
     const fee = calculateFee(gasLimit, gasPrice);
     const { accountOnChain } = props;
     assert(accountOnChain, "accountOnChain missing");
+    assert(accountOnChain.accountNumber, "accountNumber missing");
     return {
       accountNumber: accountOnChain.accountNumber,
       sequence: accountOnChain.sequence,
diff --git a/components/forms/UnDelegationForm.tsx b/components/forms/UnDelegationForm.tsx
index 50cb41f..0274bbf 100644
--- a/components/forms/UnDelegationForm.tsx
+++ b/components/forms/UnDelegationForm.tsx
@@ -50,6 +50,7 @@ const UnDelegationForm = (props: Props) => {
     const fee = calculateFee(gasLimit, gasPrice);
     const { accountOnChain } = props;
     assert(accountOnChain, "accountOnChain missing");
+    assert(accountOnChain.accountNumber, "accountNumber missing");
     return {
       accountNumber: accountOnChain.accountNumber,
       sequence: accountOnChain.sequence,
diff --git a/pages/multi/[address]/transaction/[transactionID].tsx b/pages/multi/[address]/transaction/[transactionID].tsx
index d67c41e..fe8d0b6 100644
--- a/pages/multi/[address]/transaction/[transactionID].tsx
+++ b/pages/multi/[address]/transaction/[transactionID].tsx
@@ -113,6 +113,7 @@ const TransactionPage = ({
       setBroadcastError("");
 
       assert(accountOnChain, "Account on chain value missing.");
+      assert(accountOnChain.accountNumber, "Account on chain is missing an accountNumber");
       assert(pubkey, "Pubkey not found on chain or in database");
       const bodyBytes = fromBase64(currentSignatures[0].bodyBytes);
       const signedTxBytes = makeMultisignedTxBytes(

From 11499f078c1d7065e128396e658665705e72328e Mon Sep 17 00:00:00 2001
From: abefernan <44572727+abefernan@users.noreply.github.com>
Date: Mon, 24 Apr 2023 22:30:24 +0200
Subject: [PATCH 2/5] Account for falsy accountNumber

---
 components/forms/DelegationForm.tsx                   | 2 +-
 components/forms/ReDelegationForm.tsx                 | 2 +-
 components/forms/RewardsForm.tsx                      | 2 +-
 components/forms/TransactionForm.tsx                  | 2 +-
 components/forms/UnDelegationForm.tsx                 | 2 +-
 pages/multi/[address]/transaction/[transactionID].tsx | 5 ++++-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/components/forms/DelegationForm.tsx b/components/forms/DelegationForm.tsx
index 611794a..98e0773 100644
--- a/components/forms/DelegationForm.tsx
+++ b/components/forms/DelegationForm.tsx
@@ -50,7 +50,7 @@ const DelegationForm = (props: Props) => {
     const fee = calculateFee(gasLimit, gasPrice);
     const { accountOnChain } = props;
     assert(accountOnChain, "accountOnChain missing");
-    assert(accountOnChain.accountNumber, "accountNumber missing");
+    assert(typeof accountOnChain.accountNumber === "number", "accountNumber missing");
     return {
       accountNumber: accountOnChain.accountNumber,
       sequence: accountOnChain.sequence,
diff --git a/components/forms/ReDelegationForm.tsx b/components/forms/ReDelegationForm.tsx
index 65c70e8..add2781 100644
--- a/components/forms/ReDelegationForm.tsx
+++ b/components/forms/ReDelegationForm.tsx
@@ -57,7 +57,7 @@ const ReDelegationForm = (props: Props) => {
     const fee = calculateFee(gasLimit, gasPrice);
     const { accountOnChain } = props;
     assert(accountOnChain, "accountOnChain missing");
-    assert(accountOnChain.accountNumber, "accountNumber missing");
+    assert(typeof accountOnChain.accountNumber === "number", "accountNumber missing");
     return {
       accountNumber: accountOnChain.accountNumber,
       sequence: accountOnChain.sequence,
diff --git a/components/forms/RewardsForm.tsx b/components/forms/RewardsForm.tsx
index 3ee2dcf..e26dddb 100644
--- a/components/forms/RewardsForm.tsx
+++ b/components/forms/RewardsForm.tsx
@@ -40,7 +40,7 @@ const RewardsForm = (props: Props) => {
     const fee = calculateFee(gasLimit, gasPrice);
     const { accountOnChain } = props;
     assert(accountOnChain, "accountOnChain missing");
-    assert(accountOnChain.accountNumber, "accountNumber missing");
+    assert(typeof accountOnChain.accountNumber === "number", "accountNumber missing");
     return {
       accountNumber: accountOnChain.accountNumber,
       sequence: accountOnChain.sequence,
diff --git a/components/forms/TransactionForm.tsx b/components/forms/TransactionForm.tsx
index 6fd0f6f..bdcc1db 100644
--- a/components/forms/TransactionForm.tsx
+++ b/components/forms/TransactionForm.tsx
@@ -52,7 +52,7 @@ const TransactionForm = (props: Props) => {
     const fee = calculateFee(gasLimit, gasPrice);
     const { accountOnChain } = props;
     assert(accountOnChain, "accountOnChain missing");
-    assert(accountOnChain.accountNumber, "accountNumber missing");
+    assert(typeof accountOnChain.accountNumber === "number", "accountNumber missing");
     return {
       accountNumber: accountOnChain.accountNumber,
       sequence: accountOnChain.sequence,
diff --git a/components/forms/UnDelegationForm.tsx b/components/forms/UnDelegationForm.tsx
index 0274bbf..699c4dd 100644
--- a/components/forms/UnDelegationForm.tsx
+++ b/components/forms/UnDelegationForm.tsx
@@ -50,7 +50,7 @@ const UnDelegationForm = (props: Props) => {
     const fee = calculateFee(gasLimit, gasPrice);
     const { accountOnChain } = props;
     assert(accountOnChain, "accountOnChain missing");
-    assert(accountOnChain.accountNumber, "accountNumber missing");
+    assert(typeof accountOnChain.accountNumber === "number", "accountNumber missing");
     return {
       accountNumber: accountOnChain.accountNumber,
       sequence: accountOnChain.sequence,
diff --git a/pages/multi/[address]/transaction/[transactionID].tsx b/pages/multi/[address]/transaction/[transactionID].tsx
index fe8d0b6..df4770b 100644
--- a/pages/multi/[address]/transaction/[transactionID].tsx
+++ b/pages/multi/[address]/transaction/[transactionID].tsx
@@ -113,7 +113,10 @@ const TransactionPage = ({
       setBroadcastError("");
 
       assert(accountOnChain, "Account on chain value missing.");
-      assert(accountOnChain.accountNumber, "Account on chain is missing an accountNumber");
+      assert(
+        typeof accountOnChain.accountNumber === "number",
+        "Account on chain is missing an accountNumber",
+      );
       assert(pubkey, "Pubkey not found on chain or in database");
       const bodyBytes = fromBase64(currentSignatures[0].bodyBytes);
       const signedTxBytes = makeMultisignedTxBytes(

From dfe68ccb89ded6ee7a74e3e69f2f415d668a495b Mon Sep 17 00:00:00 2001
From: abefernan <44572727+abefernan@users.noreply.github.com>
Date: Mon, 24 Apr 2023 22:42:21 +0200
Subject: [PATCH 3/5] Add conditional rendering for null accountOnChain

---
 pages/multi/[address]/index.tsx | 78 ++++++++++++++++++---------------
 1 file changed, 43 insertions(+), 35 deletions(-)

diff --git a/pages/multi/[address]/index.tsx b/pages/multi/[address]/index.tsx
index 6fb70a9..fe3d233 100644
--- a/pages/multi/[address]/index.tsx
+++ b/pages/multi/[address]/index.tsx
@@ -111,35 +111,35 @@ const Multipage = () => {
             </div>
           </StackableContainer>
         )}
-        {txView === "send" && (
+        {txView === "send" && accountOnChain && (
           <TransactionForm
             address={multisigAddress}
             accountOnChain={accountOnChain}
             closeForm={closeForm}
           />
         )}
-        {txView === "delegate" && (
+        {txView === "delegate" && accountOnChain && (
           <DelegationForm
             delegatorAddress={multisigAddress}
             accountOnChain={accountOnChain}
             closeForm={closeForm}
           />
         )}
-        {txView === "undelegate" && (
+        {txView === "undelegate" && accountOnChain && (
           <UnDelegationForm
             delegatorAddress={multisigAddress}
             accountOnChain={accountOnChain}
             closeForm={closeForm}
           />
         )}
-        {txView === "redelegate" && (
+        {txView === "redelegate" && accountOnChain && (
           <ReDelegationForm
             delegatorAddress={multisigAddress}
             accountOnChain={accountOnChain}
             closeForm={closeForm}
           />
         )}
-        {txView === "claimRewards" && (
+        {txView === "claimRewards" && accountOnChain && (
           <RewardsForm
             delegatorAddress={multisigAddress}
             accountOnChain={accountOnChain}
@@ -158,36 +158,44 @@ const Multipage = () => {
                   Once a transaction is created, it can be signed by the multisig members, and then
                   broadcast.
                 </p>
-                <Button
-                  label="Create Transaction"
-                  onClick={() => {
-                    setTxView("send");
-                  }}
-                />
-                <Button
-                  label="Create Delegation"
-                  onClick={() => {
-                    setTxView("delegate");
-                  }}
-                />
-                <Button
-                  label="Create UnDelegation"
-                  onClick={() => {
-                    setTxView("undelegate");
-                  }}
-                />
-                <Button
-                  label="Create Redelegate"
-                  onClick={() => {
-                    setTxView("redelegate");
-                  }}
-                />
-                <Button
-                  label="Claim Rewards"
-                  onClick={() => {
-                    setTxView("claimRewards");
-                  }}
-                />
+                {accountOnChain ? (
+                  <>
+                    <Button
+                      label="Create Transaction"
+                      onClick={() => {
+                        setTxView("send");
+                      }}
+                    />
+                    <Button
+                      label="Create Delegation"
+                      onClick={() => {
+                        setTxView("delegate");
+                      }}
+                    />
+                    <Button
+                      label="Create UnDelegation"
+                      onClick={() => {
+                        setTxView("undelegate");
+                      }}
+                    />
+                    <Button
+                      label="Create Redelegate"
+                      onClick={() => {
+                        setTxView("redelegate");
+                      }}
+                    />
+                    <Button
+                      label="Claim Rewards"
+                      onClick={() => {
+                        setTxView("claimRewards");
+                      }}
+                    />
+                  </>
+                ) : (
+                  <p>
+                    An account needs to be present on the multisig before creating a transaction.
+                  </p>
+                )}
               </StackableContainer>
             </div>
           </div>

From c7238ae6bd6dd97978c04158cb48a062aa1ba7d8 Mon Sep 17 00:00:00 2001
From: abefernan <44572727+abefernan@users.noreply.github.com>
Date: Mon, 24 Apr 2023 22:42:37 +0200
Subject: [PATCH 4/5] Remove null typing for account on forms

---
 components/forms/DelegationForm.tsx   | 3 +--
 components/forms/ReDelegationForm.tsx | 3 +--
 components/forms/RewardsForm.tsx      | 3 +--
 components/forms/TransactionForm.tsx  | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/components/forms/DelegationForm.tsx b/components/forms/DelegationForm.tsx
index 98e0773..6f2ff60 100644
--- a/components/forms/DelegationForm.tsx
+++ b/components/forms/DelegationForm.tsx
@@ -12,7 +12,7 @@ import StackableContainer from "../layout/StackableContainer";
 
 interface Props {
   delegatorAddress: string;
-  accountOnChain: Account | null;
+  accountOnChain: Account;
   router: NextRouter;
   closeForm: () => void;
 }
@@ -49,7 +49,6 @@ const DelegationForm = (props: Props) => {
     assert(gasPrice, "gasPrice missing");
     const fee = calculateFee(gasLimit, gasPrice);
     const { accountOnChain } = props;
-    assert(accountOnChain, "accountOnChain missing");
     assert(typeof accountOnChain.accountNumber === "number", "accountNumber missing");
     return {
       accountNumber: accountOnChain.accountNumber,
diff --git a/components/forms/ReDelegationForm.tsx b/components/forms/ReDelegationForm.tsx
index add2781..ec2a98b 100644
--- a/components/forms/ReDelegationForm.tsx
+++ b/components/forms/ReDelegationForm.tsx
@@ -12,7 +12,7 @@ import StackableContainer from "../layout/StackableContainer";
 
 interface Props {
   delegatorAddress: string;
-  accountOnChain: Account | null;
+  accountOnChain: Account;
   router: NextRouter;
   closeForm: () => void;
 }
@@ -56,7 +56,6 @@ const ReDelegationForm = (props: Props) => {
     assert(gasPrice, "gasPrice missing");
     const fee = calculateFee(gasLimit, gasPrice);
     const { accountOnChain } = props;
-    assert(accountOnChain, "accountOnChain missing");
     assert(typeof accountOnChain.accountNumber === "number", "accountNumber missing");
     return {
       accountNumber: accountOnChain.accountNumber,
diff --git a/components/forms/RewardsForm.tsx b/components/forms/RewardsForm.tsx
index e26dddb..f0f583e 100644
--- a/components/forms/RewardsForm.tsx
+++ b/components/forms/RewardsForm.tsx
@@ -11,7 +11,7 @@ import StackableContainer from "../layout/StackableContainer";
 
 interface Props {
   delegatorAddress: string;
-  accountOnChain: Account | null;
+  accountOnChain: Account;
   router: NextRouter;
   closeForm: () => void;
 }
@@ -39,7 +39,6 @@ const RewardsForm = (props: Props) => {
     assert(gasPrice, "gasPrice missing");
     const fee = calculateFee(gasLimit, gasPrice);
     const { accountOnChain } = props;
-    assert(accountOnChain, "accountOnChain missing");
     assert(typeof accountOnChain.accountNumber === "number", "accountNumber missing");
     return {
       accountNumber: accountOnChain.accountNumber,
diff --git a/components/forms/TransactionForm.tsx b/components/forms/TransactionForm.tsx
index bdcc1db..47dfb82 100644
--- a/components/forms/TransactionForm.tsx
+++ b/components/forms/TransactionForm.tsx
@@ -12,7 +12,7 @@ import StackableContainer from "../layout/StackableContainer";
 
 interface Props {
   address: string | null;
-  accountOnChain: Account | null;
+  accountOnChain: Account;
   router: NextRouter;
   closeForm: () => void;
 }
@@ -51,7 +51,6 @@ const TransactionForm = (props: Props) => {
     assert(gasPrice, "gasPrice missing");
     const fee = calculateFee(gasLimit, gasPrice);
     const { accountOnChain } = props;
-    assert(accountOnChain, "accountOnChain missing");
     assert(typeof accountOnChain.accountNumber === "number", "accountNumber missing");
     return {
       accountNumber: accountOnChain.accountNumber,

From 383fa44d2977b98ce6765ba1758a9a09a02ee83e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Abel=20Fern=C3=A1ndez?=
 <44572727+abefernan@users.noreply.github.com>
Date: Tue, 25 Apr 2023 09:55:11 +0200
Subject: [PATCH 5/5] Update pages/multi/[address]/index.tsx

Co-authored-by: Simon Warta <2603011+webmaster128@users.noreply.github.com>
---
 pages/multi/[address]/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/multi/[address]/index.tsx b/pages/multi/[address]/index.tsx
index fe3d233..4af7b13 100644
--- a/pages/multi/[address]/index.tsx
+++ b/pages/multi/[address]/index.tsx
@@ -193,7 +193,7 @@ const Multipage = () => {
                   </>
                 ) : (
                   <p>
-                    An account needs to be present on the multisig before creating a transaction.
+                    An account needs to be present on chain before creating a transaction. Send some tokens to the address first.
                   </p>
                 )}
               </StackableContainer>