Merge pull request #5623 from cmgustavo/ref/bitpay-card-02

Ref/bitpay card 02

www/views/amount.html

@@ -17,7 +17,7 @@
     <div ng-if="!customAmount && !isGlidera && !nextStep">
       <div class="item item-no-bottom-border recipient-label" translate>Recipient</div>
 
-      <div class="item item-text-wrap item-icon-left bitcoin-address" ng-class="{'item-big-icon-left':cardId}">
+      <div class="item item-text-wrap item-icon-left bitcoin-address">
         <i class="icon big-icon-svg" ng-if="isWallet">
           <img src="img/icon-wallet.svg" ng-style="{'background-color': toColor}" class="bg"/>
         </i>
@@ -25,10 +25,7 @@
           <i class="icon big-icon-svg" ng-if="isChromeApp">
             <img src="img/contact-placeholder.svg" class="bg"/>
           </i>
-          <gravatar ng-if="!cardId && !isChromeApp" class="send-gravatar" name="{{toName}}" height="30" width="30" email="{{toEmail}}"></gravatar>
-          <i ng-if="cardId" class="icon big-icon-svg">
-            <div class="bg icon-bitpay-card"></div>
-          </i>
+          <gravatar ng-if="!isChromeApp" class="send-gravatar" name="{{toName}}" height="30" width="30" email="{{toEmail}}"></gravatar>
         </span>
         <span class="m10l">{{toName || toAddress}}</span>
       </div>
@@ -40,7 +37,6 @@
       <div class="amount-bar oh">
         <div class="title">
           <span translate>Amount</span>
-          <div class="size-12" ng-if="cardId" ng-init="getRates()">{{exchangeRate}}</div>
           <div ng-show="isGlidera">
             <div class="limits" ng-show="limits && isGlidera == 'buy'">
               <span>Daily buy limit</span>:

www/views/bitpayCard.html

@@ -23,7 +23,7 @@
 
           <a class="button button-primary button-small m5t size-14"
             style="padding: 0.5em 1em;"
-            ui-sref="tabs.bitpayCard.amount({'cardId': cardId, 'toName': 'BitPay Card'})">
+            ui-sref="tabs.bitpayCard.amount({nextStep: 'tabs.bitpayCard.topup'})">
             <i class="icon ion-plus m10r" style="vertical-align: baseline;"></i>
             {{'Add Funds'|translate}}
           </a>

www/views/confirm.html

@@ -17,7 +17,6 @@
         </div>
         <div class="amount-label">
           <div class="amount">{{displayAmount || '...'}} <span class="unit">{{displayUnit}}</span></div>
-          <div class="right size-12" ng-if="cardId" ng-init="getRates()">{{exchangeRate}}</div>
           <div class="alternative">{{alternativeAmountStr || '...'}}</div>
         </div>
       </div>
@@ -31,11 +30,7 @@
         <div class="item">
           <span class="label" translate>To</span>
           <span class="payment-proposal-to">
-            <img ng-if="!cardId && !isGiftCard" src="img/icon-bitcoin-small.svg">
-            <img ng-if="cardId" src="img/icon-card.svg" width="34">
-            <i ng-if="isGiftCard" class="icon big-icon-svg">
-              <div class="bg icon-amazon"></div>
-            </i>
+            <img src="img/icon-bitcoin-small.svg">
 
             <div copy-to-clipboard="toAddress" ng-if="!paypro" class="ellipsis">
               <contact ng-if="!toName" address="{{toAddress}}"></contact>

www/views/topup.html

@@ -0,0 +1,97 @@
+<ion-view id="bitpayCard" hide-tabs>
+  <ion-nav-bar class="bar-royal">
+    <ion-nav-back-button>
+    </ion-nav-back-button>
+    <ion-nav-title>Add funds</ion-nav-title>
+  </ion-nav-bar>
+
+  <ion-content class="add-bottom-for-cta">
+    <!-- SELL -->
+    <div class="list" ng-if="cardInfo">
+
+      <div class="item head">
+        <div class="sending-label">
+          <i class="icon big-icon-svg">
+            <div class="bg icon-bitpay-card"></div>
+          </i>
+          <span>BitPay Card - Visa &reg; Prepaid Debit</span>
+        </div>
+        <div class="amount-label">
+          <div class="amount-final">{{amountUnitStr}}</div>
+          <div class="alternative" ng-show="isFiat && rate">
+            @ {{rate | currency:'$':2}} per BTC
+          </div>
+        </div>
+      </div> 
+
+      <div class="info">
+
+        <div class="item item-icon-right" ng-click="showWalletSelector()">
+          <div class="label">From</div>
+          <div class="wallet">
+            <i class="icon big-icon-svg">
+              <img src="img/icon-wallet.svg" ng-style="{'background-color': wallet.color}" class="bg">
+            </i>
+            {{wallet ? wallet.name : '...'}}
+          </div>
+          <i class="icon bp-arrow-right"></i>
+        </div>
+
+        <div class="item item-divider">
+          Deposit into
+        </div>
+        <div class="item">
+          Card
+          <span class="item-note">
+            xxxx-xxxx-xxxx-{{cardInfo.lastFourDigits}}
+          </span>
+        </div>
+        <div class="item">
+          Account
+          <span class="item-note">
+            {{cardInfo.email}}
+          </span>
+        </div> 
+      </div>
+    </div>
+
+  </ion-content>
+
+  <click-to-accept
+    ng-disabled="!cardInfo || !wallet"
+    ng-click="topUpConfirm()"
+    ng-if="!isCordova && cardInfo"
+    click-send-status="sendStatus"
+    has-wallet-chosen="wallet"
+    insufficient-funds="false"
+    no-matching-wallet="!cardInfo">
+    Add funds
+  </click-to-accept>
+  <slide-to-accept
+    ng-disabled="!cardInfo || !wallet"
+    ng-if="isCordova && cardInfo"
+    slide-on-confirm="topUpConfirm()"
+    slide-send-status="sendStatus"
+    has-wallet-chosen="wallet"
+    insufficient-funds="false"
+    no-matching-wallet="!cardInfo">
+    Slide to confirm
+  </slide-to-accept>
+  <slide-to-accept-success
+    slide-success-show="sendStatus === 'success'"
+    slide-success-on-confirm="goBackHome()"
+    slide-success-hide-on-confirm="true">
+    <span>Sent</span>
+    <div class="m10 size-14">
+      Funds were added to debit card
+    </div>
+  </slide-to-accept-success>
+
+  <wallet-selector
+    wallet-selector-title="walletSelectorTitle"
+    wallet-selector-wallets="wallets"
+    wallet-selector-selected-wallet="wallet"
+    wallet-selector-show="showWallets"
+    wallet-selector-on-select="onWalletSelect">
+  </wallet-selector>
+</ion-view>