Merge branch 'wallet/sprint/16' into wallet/task/322

www/views/advancedSettings.html

@@ -29,15 +29,6 @@
       <ion-toggle ng-model="hideNextSteps.value" ng-if="!isWindowsPhoneApp" toggle-class="toggle-balanced" ng-change="nextStepsChange()">
         <span class="toggle-label" translate>Hide Next Steps Card</span>
       </ion-toggle>
-
-      <div class="item item-divider"></div>
-
-      <ion-toggle class="has-comment" ng-model="displayBitcoinCoreEnabled.value" toggle-class="toggle-balanced" ng-change="displayBitcoinCoreChange()">
-        <span class="toggle-label" translate>Bitcoin Core Wallet</span>
-      </ion-toggle>
-      <div class="comment" translate>
-          If enabled, Bitcoin Core (BTC) wallet(s) will be displayed on the Home screen. If disabled, BTC wallets will be not be deleted, only hidden.
-      </div>
     </div>
   </ion-content>
 </ion-view>

www/views/amount.html

@@ -18,11 +18,11 @@
             <div class="send-amount-tool-input amount">
               <div class="primary-amount"
                 ng-class="{long: amountModel.amount.length > 5, 'very-long': amountModel.amount.length > 10}">
-                <span class="primary-amount-display">{{ amountModel.amount || 0 }}</span><span class="unit">{{unit}}</span>
+                <span class="primary-amount-display text-selectable">{{ amountModel.amount || 0 }}</span><span class="unit">{{unit}}</span>
               </div>
               <span ng-show="globalResult">{{globalResult}} {{unit}}</span>
               <div class="alternative-amount">
-                <span>{{alternativeAmount || '0.00'}} {{alternativeUnit}}</span>
+                <span class="text-selectable">{{alternativeAmount || '0.00'}}</span> <span>{{alternativeUnit}}</span>
               </div>
               <div class="switch-currencies" ng-click="changeUnit()"><img src="img/icon-convert.svg"></div>
             </div>

www/views/includes/walletSelector.html

@@ -37,14 +37,13 @@
       </div>
     </a>
 
-  <div class="subheader" ng-if="walletsBtc[0] && walletsBch[0] && displayWallet" translate>
+  <div class="subheader" ng-if="walletsBtc[0] && walletsBch[0]" translate>
     <img class="wallet-coin-logo" src="img/icon-bitcoin.svg" width="18">
     <span translate>Bitcoin Core (BTC)</span>
   </div>
   <a
     ng-repeat="wallet in walletsBtc track by $index"
     class="item item-icon-left item-big-icon-left item-icon-right wallet"
-    ng-show="displayWallet"
     ng-click="selectWallet(wallet)"
   >
       <i class="icon big-icon-svg" ng-include="'views/includes/walletIcon.html'"></i>

www/views/tab-home.html

@@ -28,10 +28,7 @@
         <a ng-click="hideHomeTip()"><i class="icon ion-ios-close-empty close-home-tip"></i></a>
       </div>
       <div class="title" translate>
-        Your Bitcoin Cash (BCH) Wallet is ready!
-      </div>
-      <div class="subtitle" translate>
-        A Bitcoin Core (BTC) wallet can be displayed from Settings <i class="icon bp-arrow-right"></i> Advanced
+        Your Bitcoin Wallets are ready!
       </div>
     </div>
 
@@ -51,7 +48,6 @@
       <a class="item item-icon-right item-heading" ui-sref="tabs.activity">
         <span translate>Recent Transactions</span>
         <i class="icon bp-arrow-right"></i>
-        <span class="badge badge-assertive m5t m10r" ng-show="notificationsN>3"> {{notificationsN}}</span>
       </a>
       <a class="item item-sub activity" ng-repeat="notification in notifications" ng-click="openNotificationModal(notification)">
         <span ng-include="'views/includes/walletActivity.html'"></span>
@@ -73,8 +69,7 @@
       </div>
     </div>
 
-    <div class="list card"
-        ng-show="displayBitcoinCore">
+    <div class="list card">
       <div class="item item-icon-right item-heading">
         <img class="wallet-coin-logo" src="img/icon-bitcoin.svg" width="18">
         <span translate>Bitcoin Core (BTC)</span>

www/views/tab-send.html

@@ -75,8 +75,7 @@
         <a class="item item-icon-left item-icon-right"
           ng-repeat="item in list"
           ng-if="hasWallets && item.recipientType == 'wallet'"
-          ng-click="goToAmount(item)"
-          ng-show="item.displayWallet">
+          ng-click="goToAmount(item)">
           <i class="icon big-icon-svg" ng-if="item.recipientType == 'wallet'" ng-init="wallet = item" ng-include="'views/includes/walletIcon.html'"></i>
           {{item.name}}
           <p>