Merge pull request #89 from Bitcoin-com/dev-jb

Dev jb

www/views/addressbook.html

@@ -13,7 +13,7 @@
   </ion-nav-bar>
   <ion-content scroll="false" id="add-address" ng-show="isEmptyList">
     <div class="zero-state">
-      <i class="icon zero-state-icon">
+      <i class="icon">
         <img class="svg" src="img/address-book-add.svg"/>
       </i>
       <div class="zero-state-heading" translate>No contacts yet</div>

www/views/amount.html

@@ -56,7 +56,7 @@
               <span translate>Send max amount</span>
             </span>
           </button>
-          <button class="button button-sendmax" ng-click="changeUnit()">Switch Currencies<button/>
+          <button class="button button-sendmax" ng-click="changeUnit()">Switch Currencies</button>
         </div>
       </div>
     </div>

www/views/tab-receive.html

@@ -31,7 +31,7 @@
         <div ng-show="!showingPaymentReceived">
           <div>
             <button ng-show="addr" class="button button-standard button-small" ng-click="requestSpecificAmount()">
-              <span translate>Request Specific amount</span>
+              <span translate>Request Specific Amount</span>
             </button><br/><br/>
           </div>
           <div copy-to-clipboard="wallet.coin == 'bch' && bchAddressType.type == 'cashaddr' ? 'bitcoincash:' + addr : addr">

www/views/walletDetails.html

@@ -123,7 +123,7 @@
 
       <div
         ng-click='updateAll(true)'
-        ng-show="!updateStatusError && !wallet.balanceHidden && !wallet.scanning"
+        ng-show="selectedPriceDisplay=='crypto' && !updateStatusError && !wallet.balanceHidden && !wallet.scanning"
         on-hold="hideToggle()"
         ng-style="{'transform': amountScale}"
         ng-class="{amount__balance: amountIsCollapsible}">
@@ -136,6 +136,21 @@
         </div>
       </div>
 
+      <div
+        ng-click='updateAll(true)'
+        ng-show="selectedPriceDisplay=='fiat' && !updateStatusError && !wallet.balanceHidden && !wallet.scanning"
+        on-hold="hideToggle()"
+        ng-style="{'transform': amountScale}"
+        ng-class="{amount__balance: amountIsCollapsible}">
+        <strong class="size-36">{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}</strong>
+        <div
+          class="size-14 amount-alternative"
+          ng-if="status.totalBalanceAlternative && wallet.network == 'livenet'"
+          ng-style="{opacity: altAmountOpacity}">
+          {{status.totalBalanceStr}}
+        </div>
+      </div>
+
       <div ng-style="{'transform': amountScale}"
       class="amount__balance"
       ng-show="!updateStatusError && wallet.balanceHidden  && !wallet.scanning"
@@ -157,7 +172,7 @@
       </div>
 
 
-      <div ng-if="!wallet.balanceHidden && !wallet.scanning && showBalanceButton" ng-style="{'opacity': altAmountOpacity, 'transform': amountScale}">
+      <div ng-if="selectedPriceDisplay=='crypto' && !wallet.balanceHidden && !wallet.scanning && showBalanceButton" ng-style="{'opacity': altAmountOpacity, 'transform': amountScale}">
         <button class="button button-standard button-primary amount__button-balance size-14" ng-click="openBalanceModal()">
           <i class="icon ion-ios-checkmark-outline"></i>
           <strong>
@@ -170,6 +185,19 @@
         </button>
       </div>
 
+      <div ng-if="selectedPriceDisplay=='fiat' && !wallet.balanceHidden && !wallet.scanning && showBalanceButton" ng-style="{'opacity': altAmountOpacity, 'transform': amountScale}">
+        <button class="button button-standard button-primary amount__button-balance size-14" ng-click="openBalanceModal()">
+          <i class="icon ion-ios-checkmark-outline"></i>
+          <strong>
+            {{status.spendableBalanceAlternative}} {{status.alternativeIsoCode}}
+          </strong>
+          &nbsp;
+          <span>
+            {{status.spendableBalanceStr}}
+          </span>
+        </button>
+      </div>
+
     </div>
     <div class="wallet-details-wallet-info" ng-style="{opacity: altAmountOpacity}">
       <span ng-include="'views/includes/walletInfo.html'"></span>