From b5d6452454de8d12340e5902914fba9f420865dc Mon Sep 17 00:00:00 2001
From: Frankie <frankie.diamond@gmail.com>
Date: Thu, 13 Dec 2018 09:14:46 -1000
Subject: Disallow loading as metamaskNetworkId (#5924)

* transactions - throw an error if a transaction is generated while the network is loading

* add tests for failing when netId is loading
---
 app/scripts/controllers/transactions/tx-state-manager.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'app/scripts/controllers/transactions')

diff --git a/app/scripts/controllers/transactions/tx-state-manager.js b/app/scripts/controllers/transactions/tx-state-manager.js
index 72d869fa8..420191d9c 100644
--- a/app/scripts/controllers/transactions/tx-state-manager.js
+++ b/app/scripts/controllers/transactions/tx-state-manager.js
@@ -45,11 +45,13 @@ class TransactionStateManager extends EventEmitter {
     @returns {txMeta} the default txMeta object
   */
   generateTxMeta (opts) {
+    const netId = this.getNetwork()
+    if (netId === 'loading') throw new Error('MetaMask is having trouble connecting to the network')
     return extend({
       id: createId(),
       time: (new Date()).getTime(),
       status: 'unapproved',
-      metamaskNetworkId: this.getNetwork(),
+      metamaskNetworkId: netId,
       loadingDefaults: true,
     }, opts)
   }
-- 
cgit