From 41700cbfd7ff3f0a9334696c878ad70483deab1a Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Wed, 27 Apr 2022 12:19:57 +0200
Subject: [PATCH] Fix signer address

---
 components/forms/TransactionSigning.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/components/forms/TransactionSigning.js b/components/forms/TransactionSigning.js
index 28c125d..0dba118 100644
--- a/components/forms/TransactionSigning.js
+++ b/components/forms/TransactionSigning.js
@@ -1,7 +1,8 @@
 import React, { useState } from "react";
 import axios from "axios";
 import { toBase64 } from "@cosmjs/encoding";
-import { SigningStargateClient } from "@cosmjs/stargate";
+import { assertIsDeliverTxFailure, SigningStargateClient } from "@cosmjs/stargate";
+import { assert } from "@cosmjs/utils";
 
 import { useAppContext } from "../../context/AppContext";
 import Button from "../inputs/Button";
@@ -61,7 +62,10 @@ const TransactionSigning = (props) => {
     const offlineSigner =
       walletType === "keplr" ? window.getOfflineSignerOnlyAmino(state.chain.chainId) : ledgerSigner;
     
-    const address = walletType === "keplr" ? walletAccount.bech32Address : (await ledgerSigner.getAccounts())[0]?.address;
+    const signerAddress = walletType === "keplr"
+      ? walletAccount.bech32Address
+      : (await ledgerSigner.getAccounts())[0]?.address;
+    assert(signerAddress, "Missing signer address");
     const signingClient = await SigningStargateClient.offline(offlineSigner);
 
     const signerData = {
@@ -71,7 +75,7 @@ const TransactionSigning = (props) => {
     };
 
     const { bodyBytes, signatures } = await signingClient.sign(
-      address,
+      signerAddress,
       props.tx.msgs,
       props.tx.fee,
       props.tx.memo,
@@ -91,7 +95,7 @@ const TransactionSigning = (props) => {
       const signature = {
         bodyBytes: bases64EncodedBodyBytes,
         signature: bases64EncodedSignature,
-        address: walletAccount.bech32Address,
+        address: signerAddress,
       };
       const _res = await axios.post(`/api/transaction/${props.transactionID}/signature`, signature);
       props.addSignature(signature);