Merge branch 'master' of https://github.com/bitpay/copay into bug/android-balance-view

www/views/confirm.html

@@ -58,8 +58,8 @@
         </div>
         <a class="item item-icon-right" ng-hide="!useSendMax && (insufficientFunds || noMatchingWallet)" ng-click="showWalletSelector()">
           <span class="label" ng-if="!isGlidera" translate>From</span>
-          <span class="label" ng-if="isGlidera == 'buy'" translate>To</span>
-          <span class="label" ng-if="isGlidera == 'sell'" translate>From</span>
+          <span class="label" ng-if="isGlidera == 'buy'">To</span>
+          <span class="label" ng-if="isGlidera == 'sell'">From</span>
           <div class="wallet">
             <i class="icon big-icon-svg">
               <img src="img/icon-wallet.svg" ng-style="{'background-color': wallet.color}" class="bg"/>
@@ -123,7 +123,7 @@
     ng-if="!isCordova && wallets[0] && !insufficientFunds && !noMatchingWallet"
     click-send-status="sendStatus"
     has-wallet-chosen="wallet">
-    Click to pay
+    {{'Accept' | translate}}
   </click-to-accept>
   <slide-to-accept
     ng-disabled="!wallet"
@@ -131,14 +131,15 @@
     slide-on-confirm="onConfirm()"
     slide-send-status="sendStatus"
     has-wallet-chosen="wallet">
-    Slide to pay
+    {{'Accept' | translate}}
   </slide-to-accept>
   <slide-to-accept-success
     slide-success-show="sendStatus === 'success'"
     slide-success-on-confirm="onSuccessConfirm()"
     slide-success-hide-on-confirm="true">
-    <span ng-hide="wallet.m > 1">Payment Sent</span>
-    <span ng-show="wallet.m > 1">Proposal Created</span>
+    <span ng-show="wallet.m == 1 && (wallet.canSign() || wallet.isPrivKeyExternal())" translate>Payment Sent</span>
+    <span ng-show="wallet.m > 1 && (wallet.canSign() || wallet.isPrivKeyExternal())" translate>Proposal Created</span>
+    <span ng-show="!wallet.canSign() && !wallet.isPrivKeyExternal()" translate>Transaction created</span>
     <div ng-show="isGlidera" class="glidera-success">
       <span ng-show="isGlidera == 'buy'">A transfer has been initiated from your bank account. Your bitcoins should arrive to your wallet in 2-4 business day</span>
       <span ng-show="isGlidera == 'sell'">A transfer has been initiated to your bank account. Should arrive in 4-6 business days</span>

www/views/import.html

@@ -16,7 +16,7 @@
         <span translate>File/Text</span>
       </div>
       <div class="col" ng-click="hardware = true; phrase = file = false; showAdv = false" ng-style="hardware &&
-        {'border-bottom-style': 'solid'}">
+        {'border-bottom-style': 'solid'}" ng-show="showHardwareWallet">
         <span translate>Hardware wallet</span>
       </div>
     </div>

www/views/modals/txp-details.html

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

www/views/preferencesAltCurrency.html

@@ -7,13 +7,27 @@
     </ion-nav-back-button>
   </ion-nav-bar>
   <ion-content>
-    <ion-radio ng-repeat="altCurrency in altCurrencyList" ng-value="altCurrency.isoCode" ng-model="currentCurrency"
-      ng-click="save(altCurrency)">{{altCurrency.name}}
-    </ion-radio>
+    <div class="bar bar-header item-input-inset m20b">
+      <label class="item-input-wrapper">
+        <i class="icon ion-ios-search placeholder-icon"></i>
+        <input type="search" ng-init="searchedAltCurrency = ''" ng-model="searchedAltCurrency" ng-change="findCurrency(searchedAltCurrency)"
+          placeholder="{{'Search your currency' | translate}}">
+      </label>
+    </div>
+    <div class="list" ng-if="lastUsedAltCurrencyList[0]">
+      <ion-radio ng-repeat="lastUsedAltCurrency in lastUsedAltCurrencyList" ng-value="lastUsedAltCurrency.isoCode" ng-model="currentCurrency"
+        ng-click="save(lastUsedAltCurrency)">{{lastUsedAltCurrency.name}}
+      </ion-radio>
+    </div>
+    <div class="list">
+      <ion-radio ng-repeat="altCurrency in altCurrencyList" ng-value="altCurrency.isoCode" ng-model="currentCurrency"
+        ng-click="save(altCurrency)">{{altCurrency.name}}
+      </ion-radio>
+    </div>
     <ion-infinite-scroll
-      ng-if="!listComplete"
-      on-infinite="loadMore()"
-      distance="1%">
-    </ion-infinite-scroll>
+     ng-if="!listComplete"
+     on-infinite="loadMore()"
+     distance="50%">
+   </ion-infinite-scroll>
   </ion-content>
 </ion-view>