From 800a5be99006c84de56811fcb14e92fe86ccdcc5 Mon Sep 17 00:00:00 2001
From: slowbackspace <slowbackspace@gmail.com>
Date: Sun, 16 Dec 2018 23:52:02 +0100
Subject: [PATCH] pass network.shortcut to Content component

---
 src/views/Wallet/views/Account/Receive/ethereum/index.js | 3 ++-
 src/views/Wallet/views/Account/Receive/ripple/index.js   | 3 ++-
 src/views/Wallet/views/Account/Send/ethereum/index.js    | 2 +-
 src/views/Wallet/views/Account/Send/ripple/index.js      | 2 +-
 src/views/Wallet/views/Account/SignVerify/index.js       | 4 ++--
 src/views/Wallet/views/Account/Summary/ethereum/index.js | 2 +-
 src/views/Wallet/views/Account/Summary/ripple/index.js   | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/views/Wallet/views/Account/Receive/ethereum/index.js b/src/views/Wallet/views/Account/Receive/ethereum/index.js
index 291fbcc8..89340dcc 100644
--- a/src/views/Wallet/views/Account/Receive/ethereum/index.js
+++ b/src/views/Wallet/views/Account/Receive/ethereum/index.js
@@ -97,9 +97,10 @@ const AccountReceive = (props: Props) => {
         discovery,
         shouldRender,
         loader,
+        network,
     } = props.selectedAccount;
     const { type, title, message } = loader;
-    if (!device || !account || !discovery || !shouldRender) return <Content type={type} title={title} message={message} isLoading />;
+    if (!device || !account || !discovery || !shouldRender) return <Content type={type} title={title} message={message} networkShortcut={(network || {}).shortcut} isLoading />;
 
     const {
         addressVerified,
diff --git a/src/views/Wallet/views/Account/Receive/ripple/index.js b/src/views/Wallet/views/Account/Receive/ripple/index.js
index 6bc0d7ed..94383077 100644
--- a/src/views/Wallet/views/Account/Receive/ripple/index.js
+++ b/src/views/Wallet/views/Account/Receive/ripple/index.js
@@ -97,9 +97,10 @@ const AccountReceive = (props: Props) => {
         discovery,
         shouldRender,
         loader,
+        network,
     } = props.selectedAccount;
     const { type, title, message } = loader;
-    if (!device || !account || !discovery || !shouldRender) return <Content type={type} title={title} message={message} isLoading />;
+    if (!device || !account || !discovery || !shouldRender) return <Content type={type} title={title} message={message} networkShortcut={(network || {}).shortcut} isLoading />;
 
     const {
         addressVerified,
diff --git a/src/views/Wallet/views/Account/Send/ethereum/index.js b/src/views/Wallet/views/Account/Send/ethereum/index.js
index 5e53d918..f92674eb 100644
--- a/src/views/Wallet/views/Account/Send/ethereum/index.js
+++ b/src/views/Wallet/views/Account/Send/ethereum/index.js
@@ -214,7 +214,7 @@ const AccountSend = (props: Props) => {
         onSend,
     } = props.sendFormActions;
     const { type, title, message } = loader;
-    if (!device || !account || !discovery || !network || !shouldRender) return <Content type={type} title={title} message={message} isLoading />;
+    if (!device || !account || !discovery || !network || !shouldRender) return <Content type={type} title={title} message={message} networkShortcut={(network || {}).shortcut} isLoading />;
 
     const isCurrentCurrencyToken = networkSymbol !== currency;
 
diff --git a/src/views/Wallet/views/Account/Send/ripple/index.js b/src/views/Wallet/views/Account/Send/ripple/index.js
index 010f9154..7d7caf9e 100644
--- a/src/views/Wallet/views/Account/Send/ripple/index.js
+++ b/src/views/Wallet/views/Account/Send/ripple/index.js
@@ -143,7 +143,7 @@ const AccountSend = (props: Props) => {
         onSend,
     } = props.sendFormActions;
     const { type, title, message } = loader;
-    if (!device || !account || !discovery || !network || !shouldRender) return <Content type={type} title={title} message={message} isLoading />;
+    if (!device || !account || !discovery || !network || !shouldRender) return <Content type={type} title={title} message={message} networkShortcut={(network || {}).shortcut} isLoading />;
 
     let isSendButtonDisabled: boolean = Object.keys(errors).length > 0 || total === '0' || amount.length === 0 || address.length === 0 || sending;
     let sendButtonText: string = ` ${total} ${network.symbol}`;
diff --git a/src/views/Wallet/views/Account/SignVerify/index.js b/src/views/Wallet/views/Account/SignVerify/index.js
index 96e7e527..fc8d39a0 100644
--- a/src/views/Wallet/views/Account/SignVerify/index.js
+++ b/src/views/Wallet/views/Account/SignVerify/index.js
@@ -57,10 +57,10 @@ class SignVerify extends Component <Props> {
     render() {
         const device = this.props.wallet.selectedDevice;
         const {
-            account, discovery, shouldRender, notification,
+            account, discovery, shouldRender, notification, network,
         } = this.props.selectedAccount;
         const { type, title, message } = notification;
-        if (!device || !account || !discovery || !shouldRender) return <Content type={type} title={title} message={message} isLoading />;
+        if (!device || !account || !discovery || !shouldRender) return <Content type={type} title={title} message={message} networkShortcut={(network || {}).shortcut} isLoading />;
         const {
             signVerifyActions,
             signVerify: {
diff --git a/src/views/Wallet/views/Account/Summary/ethereum/index.js b/src/views/Wallet/views/Account/Summary/ethereum/index.js
index 770fb273..a2ce8d95 100644
--- a/src/views/Wallet/views/Account/Summary/ethereum/index.js
+++ b/src/views/Wallet/views/Account/Summary/ethereum/index.js
@@ -82,7 +82,7 @@ const AccountSummary = (props: Props) => {
 
     const { type, title, message } = loader;
 
-    if (!device || !account || !network || !shouldRender) return <Content type={type} title={title} message={message} isLoading />;
+    if (!device || !account || !network || !shouldRender) return <Content type={type} title={title} message={message} networkShortcut={(network || {}).shortcut} isLoading />;
 
     const explorerLink: string = `${network.explorer.address}${account.address}`;
     const pendingAmount: BigNumber = stateUtils.getPendingAmount(pending, network.symbol);
diff --git a/src/views/Wallet/views/Account/Summary/ripple/index.js b/src/views/Wallet/views/Account/Summary/ripple/index.js
index 1b97e841..ea0501e1 100644
--- a/src/views/Wallet/views/Account/Summary/ripple/index.js
+++ b/src/views/Wallet/views/Account/Summary/ripple/index.js
@@ -72,7 +72,7 @@ const AccountSummary = (props: Props) => {
 
     const { type, title, message } = loader;
 
-    if (!device || !account || !network || !shouldRender) return <Content type={type} title={title} message={message} isLoading />;
+    if (!device || !account || !network || !shouldRender) return <Content type={type} title={title} message={message} networkShortcut={(network || {}).shortcut} isLoading />;
 
     const explorerLink: string = `${network.explorer.address}${account.address}`;
     const pendingAmount: BigNumber = stateUtils.getPendingAmount(pending, network.symbol);