Merge pull request #5437 from JDonadio/ref/confirm-button

Slide/Click button at confirm view

www/views/confirm.html

@@ -131,17 +131,16 @@
     has-wallet-chosen="wallet"
     insufficient-funds="insufficientFunds"
     no-matching-wallet="noMatchingWallet">
-    {{'Accept' | translate}}
+    {{buttonText}}
   </click-to-accept>
   <slide-to-accept
-    ng-disabled="!wallet"
-    ng-if="isCordova"
+    ng-if="isCordova && (wallet && !insufficientFunds && !noMatchingWallet)"
     slide-on-confirm="onConfirm()"
     slide-send-status="sendStatus"
     has-wallet-chosen="wallet"
     insufficient-funds="insufficientFunds"
     no-matching-wallet="noMatchingWallet">
-    {{'Accept' | translate}}
+    {{buttonText}}
   </slide-to-accept>
   <slide-to-accept-success
     slide-success-show="sendStatus === 'success'"

www/views/includes/slideToAccept.html

@@ -1,34 +1,20 @@
 <div class="slide__listener"
-  ng-touchstart="onTouchstart($event);"
-  ng-touchmove="onTouchmove($event);"
-  ng-touchend="onTouchend($event);"
-  ng-mousedown="onTouchstart($event);"
-  ng-mousemove="onTouchmove($event);"
-  ng-mouseup="onTouchend($event);"
->
-  <div
-    class="slide__slider"
-    ng-style="sliderStyle"
-  >
+  ng-touchstart="onTouchstart($event)"
+  ng-touchmove="onTouchmove($event)"
+  ng-touchend="onTouchend($event)"
+  ng-mousedown="onTouchstart($event)"
+  ng-mousemove="onTouchmove($event)"
+  ng-mouseup="onTouchend($event)">
+  <div class="slide__slider" ng-style="sliderStyle">
     <div class="slide__slider__tip"></div>
   </div>
-  <div
-    class="slide__bitcoin"
-    ng-style="bitcoinStyle"
-  >
+  <div class="slide__bitcoin" ng-style="bitcoinStyle">
     <img src="img/icon-bitcoin-white.svg">
   </div>
-  <div
-    class="slide__button-text"
-    ng-style="textStyle"
-  >
+  <div class="slide__button-text" ng-style="textStyle">
     <ng-transclude></ng-transclude>
   </div>
-  <div
-    class="slide__status-text"
-    ng-class="{enter: isSlidFully}"
-    ng-hide="sendStatus === 'success'"
-  >
+  <div class="slide__status-text" ng-class="{enter: isSlidFully}" ng-hide="sendStatus === 'success'">
     <img src="img/spinner.png">
     {{displaySendStatus}}
   </div>

www/views/modals/txp-details.html

@@ -166,19 +166,18 @@
     ng-if="tx.pendingForUs && canSign && !paymentExpired && hasClick"
     click-send-status="sendStatus"
     has-wallet-chosen="true">
-    {{'Accept'| translate}}
+    {{buttonText}}
   </click-to-accept>
   <slide-to-accept
     ng-if="tx.pendingForUs && canSign && !paymentExpired && !hasClick"
     slide-on-confirm="onConfirm()"
     slide-send-status="sendStatus"
     has-wallet-chosen="true">
-    {{'Accept'| translate}}
+    {{buttonText}}
   </slide-to-accept>
   <slide-to-accept-success
     slide-success-show="sendStatus === 'success'"
-    slide-success-on-confirm="onSuccessConfirm()"
-    >
+    slide-success-on-confirm="onSuccessConfirm()">
     {{'Payment Sent' | translate}}
   </slide-to-accept-success>
 </ion-modal-view>