From fda93a53c8ac21e6c155ec21006798afa2d4d521 Mon Sep 17 00:00:00 2001
From: Mikhail Mikheev <mmvsha73@gmail.com>
Date: Fri, 29 May 2020 14:00:20 +0400
Subject: [PATCH] fix generateSafeTxHash typing

---
 .../transactions/utils/transactionHelpers.ts  | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/routes/safe/store/actions/transactions/utils/transactionHelpers.ts b/src/routes/safe/store/actions/transactions/utils/transactionHelpers.ts
index d8e5bd8c..2f514329 100644
--- a/src/routes/safe/store/actions/transactions/utils/transactionHelpers.ts
+++ b/src/routes/safe/store/actions/transactions/utils/transactionHelpers.ts
@@ -336,26 +336,29 @@ export const updateStoredTransactionsStatus = (dispatch, walletRecord): void =>
 }
 
 export function generateSafeTxHash(safeAddress: string, txArgs: TxArgs): string {
+  const messageTypes = {
+    EIP712Domain: [{ type: 'address', name: 'verifyingContract' }],
+    SafeTx: [
+      { type: 'address', name: 'to' },
+      { type: 'uint256', name: 'value' },
+      { type: 'bytes', name: 'data' },
+      { type: 'uint8', name: 'operation' },
+      { type: 'uint256', name: 'safeTxGas' },
+      { type: 'uint256', name: 'baseGas' },
+      { type: 'uint256', name: 'gasPrice' },
+      { type: 'address', name: 'gasToken' },
+      { type: 'address', name: 'refundReceiver' },
+      { type: 'uint256', name: 'nonce' },
+    ],
+  }
+  const primaryType: 'SafeTx' = 'SafeTx'
+
   const typedData = {
-    types: {
-      EIP712Domain: [{ type: 'address', name: 'verifyingContract' }],
-      SafeTx: [
-        { type: 'address', name: 'to' },
-        { type: 'uint256', name: 'value' },
-        { type: 'bytes', name: 'data' },
-        { type: 'uint8', name: 'operation' },
-        { type: 'uint256', name: 'safeTxGas' },
-        { type: 'uint256', name: 'baseGas' },
-        { type: 'uint256', name: 'gasPrice' },
-        { type: 'address', name: 'gasToken' },
-        { type: 'address', name: 'refundReceiver' },
-        { type: 'uint256', name: 'nonce' },
-      ],
-    },
+    types: messageTypes,
     domain: {
       verifyingContract: safeAddress,
     },
-    primaryType: 'SafeTx',
+    primaryType,
     message: {
       to: txArgs.to,
       value: txArgs.valueInWei,
@@ -370,6 +373,5 @@ export function generateSafeTxHash(safeAddress: string, txArgs: TxArgs): string
     },
   }
 
-  // @ts-ignore
-  return `0x${TypedDataUtils.sign(typedData).toString('hex')}`
+  return `0x${TypedDataUtils.sign<typeof messageTypes>(typedData).toString('hex')}`
 }