From 5e0b6793b26abb513c080fb92a9cf2f2728a4e62 Mon Sep 17 00:00:00 2001
From: yan <yan@mit.edu>
Date: Thu, 25 Aug 2016 15:51:58 -0700
Subject: [PATCH] Show friendly message if wallet address & paymentURL are not
 available

Also fix vertical alignment of funds select box.

Auditors: @mrose17
---
 .../locales/en-US/preferences.properties      |  1 +
 js/about/preferences.js                       | 30 +++++++++++--------
 less/about/preferences.less                   |  4 +++
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/app/extensions/brave/locales/en-US/preferences.properties b/app/extensions/brave/locales/en-US/preferences.properties
index d58d2bd9b46..8d022d88002 100644
--- a/app/extensions/brave/locales/en-US/preferences.properties
+++ b/app/extensions/brave/locales/en-US/preferences.properties
@@ -42,6 +42,7 @@ bitcoinQR=Brave wallet QR code:
 bitcoinCopyAddress=Copy Bitcoin address to clipboard
 bitcoinVisitAccount=Transfer BTC
 bitcoinBalance=Please transfer:&nbsp;
+bitcoinWalletNotAvailable=Wallet information not available. :(
 usd=&#36;
 done=Done
 enable=Enable
diff --git a/js/about/preferences.js b/js/about/preferences.js
index e7b38e56c3d..3062b389109 100644
--- a/js/about/preferences.js
+++ b/js/about/preferences.js
@@ -295,21 +295,27 @@ class BitcoinDashboard extends ImmutableComponent {
         </div>
         <div className='panel'>
           <div className='settingsListTitle' data-l10n-id='bitcoinAdd' />
-          <img src={this.ledgerData.get('paymentIMG')} title='Brave wallet QR code' />
           {
-            this.ledgerData.get('hasBitcoinHandler')
+            this.ledgerData.get('address') && this.ledgerData.get('paymentURL')
               ? <div>
-                <a href={this.ledgerData.get('paymentURL')} target='_blank'>
-                  <Button l10nId='bitcoinVisitAccount' className='primaryButton' />
-                </a>
-                <div data-l10n-id='bitcoinAddress' className='labelText' />
-                <span className='fa fa-clipboard settingsListCopy alt' title='Copy to clipboard' onClick={this.copyToClipboard.bind(this, this.ledgerData.get('address'))} />
-                <span className='smallText'>{this.ledgerData.get('address')}</span>
-              </div>
-              : <div>
-                <div data-l10n-id='bitcoinPaymentURL' className='labelText' />
-                <span id='bitcoinPaymentURL' title='Copy to clipboard' onClick={this.copyToClipboard.bind(this, this.ledgerData.get('paymentURL'))}>{this.ledgerData.get('paymentURL')}</span>
+                <img src={this.ledgerData.get('paymentIMG')} title='Brave wallet QR code' />
+                {
+                  this.ledgerData.get('hasBitcoinHandler')
+                    ? <div>
+                      <a href={this.ledgerData.get('paymentURL')} target='_blank'>
+                        <Button l10nId='bitcoinVisitAccount' className='primaryButton' />
+                      </a>
+                      <div data-l10n-id='bitcoinAddress' className='labelText' />
+                      <span className='fa fa-clipboard settingsListCopy alt' title='Copy to clipboard' onClick={this.copyToClipboard.bind(this, this.ledgerData.get('address'))} />
+                      <span className='smallText'>{this.ledgerData.get('address')}</span>
+                    </div>
+                    : <div>
+                      <div data-l10n-id='bitcoinPaymentURL' className='labelText' />
+                      <span id='bitcoinPaymentURL' title='Copy to clipboard' onClick={this.copyToClipboard.bind(this, this.ledgerData.get('paymentURL'))}>{this.ledgerData.get('paymentURL')}</span>
+                    </div>
+                }
               </div>
+            : <div data-l10n-id='bitcoinWalletNotAvailable' />
           }
         </div>
       </div>
diff --git a/less/about/preferences.less b/less/about/preferences.less
index 490ac17e9cf..f9afc6f3d1d 100644
--- a/less/about/preferences.less
+++ b/less/about/preferences.less
@@ -751,3 +751,7 @@ table.sortableTable {
     margin-left: 15px;
   }
 }
+
+#fundsSelectBox {
+  margin-top: 32px;
+}