From cbbabc3cc9be9de8a84b3b64865266afe0a9c770 Mon Sep 17 00:00:00 2001
From: pbca26 <pbca26@gmail.com>
Date: Wed, 11 Oct 2017 12:48:41 +0300
Subject: [PATCH] jumblr deposit address toaster fix

---
 react/src/components/dashboard/jumblr/jumblr.js           | 7 ++++---
 react/src/components/dashboard/receiveCoin/receiveCoin.js | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/react/src/components/dashboard/jumblr/jumblr.js b/react/src/components/dashboard/jumblr/jumblr.js
index 5e669b3..cc74b8f 100755
--- a/react/src/components/dashboard/jumblr/jumblr.js
+++ b/react/src/components/dashboard/jumblr/jumblr.js
@@ -358,7 +358,7 @@ class Jumblr extends React.Component {
                 'error'
               )
             );
-          } else if (json.result && json.result.result === 0) {
+          } else if (json.result && (json.result.result === 0 || json.result.result === null)) {
             this.setState(Object.assign({}, this.state, {
               jumblrDepositAddress: {
                 address: _genKeys.address,
@@ -367,9 +367,10 @@ class Jumblr extends React.Component {
             }));
             Store.dispatch(
               triggerToaster(
-                translate('TOASTR.JUMBLR_DEPOSIT_ADDRESS_SET'),
+                translate('TOASTR.JUMBLR_DEPOSIT_ADDRESS_SET') + ' to ' + _genKeys.address,
                 'Jumblr',
-                'success'
+                'success',
+                false
               )
             );
           }
diff --git a/react/src/components/dashboard/receiveCoin/receiveCoin.js b/react/src/components/dashboard/receiveCoin/receiveCoin.js
index d312f9c..d80bf2a 100644
--- a/react/src/components/dashboard/receiveCoin/receiveCoin.js
+++ b/react/src/components/dashboard/receiveCoin/receiveCoin.js
@@ -126,7 +126,7 @@ class ReceiveCoin extends React.Component {
 
       return items;
     } else {
-      if (this.props.electrumCoins &&
+      if (this.props.electrumCoins && this.props.mode === 'spv' &&
           type === 'public') {
         let items = [];