Bug fixes after rebase.

Please enter the commit message for your changes. Lines starting

src/js/controllers/create.js

@@ -154,23 +154,23 @@ angular.module('copayApp.controllers').controller('createController',
         return;
       }
 
-      if ($scope.seedSource.id == walletService.externalSource.ledger.id || $scope.seedSource.id == walletService.externalSource.trezor.id || self.seedSourceId == walletService.externalSource.intelTEE.id) {
+      if ($scope.seedSource.id == walletService.externalSource.ledger.id || $scope.seedSource.id == walletService.externalSource.trezor.id || $scope.seedSource.id == walletService.externalSource.intelTEE.id) {
         var account = $scope.formData.account;
         if (!account || account < 1) {
           popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Invalid account number'));
           return;
         }
 
-        if ($scope.seedSource.id == walletService.externalSource.trezor.id || self.seedSource.id == walletService.externalSource.intelTEE.id)
+        if ($scope.seedSource.id == walletService.externalSource.trezor.id || $scope.seedSource.id == walletService.externalSource.intelTEE.id)
           account = account - 1;
 
         opts.account = account;
         ongoingProcess.set('connecting' + $scope.seedSource.id, true);
 
         var src;
-        switch (self.seedSourceId) {
+        switch ($scope.seedSource.id) {
           case walletService.externalSource.ledger.id:
-            src = legder;
+            src = ledger;
             break;
           case walletService.externalSource.trezor.id:
             src = trezor;
@@ -179,7 +179,7 @@ angular.module('copayApp.controllers').controller('createController',
             src = intelTEE;
             break;
           default:
-            this.error = gettextCatalog.getString('Invalid seed source id: ' + self.seedSourceId);
+            this.error = gettextCatalog.getString('Invalid seed source id: ' + $scope.seedSource.id);
             return;
         }
 

src/js/controllers/preferencesExternal.js

@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('preferencesExternalController', function($scope, lodash, profileService, walletService) {
+angular.module('copayApp.controllers').controller('preferencesExternalController', function($scope, $stateParams, lodash, gettextCatalog, popupService, profileService, walletService) {
   var wallet = profileService.getWallet($stateParams.walletId);
 
   $scope.externalSource = lodash.find(walletService.externalSource, function(source) {

src/js/controllers/preferencesInformation.js

@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('preferencesInformation',
-  function($scope, $log, $ionicHistory, platformInfo, lodash, profileService, configService, $stateParams, $state) {
+  function($scope, $log, $ionicHistory, platformInfo, lodash, profileService, configService, $stateParams, $state, walletService) {
     var wallet = profileService.getWallet($stateParams.walletId);
     $scope.wallet = wallet;
 

src/js/services/intelTEE.js

@@ -13,7 +13,7 @@ angular.module('copayApp.services')
       derivationStrategy: 'BIP44'
     };
 
-    if (!root.description.isAvailable) {
+    if (!root.description.supported) {
       return root;
     }
 

src/sass/views/tab-receive.scss

@@ -162,6 +162,17 @@
           transform: translate(100%, -40%);
         }
       }
+      .overlay {
+        position: absolute;
+        width: 220px;
+        height: 100%;
+        background-color: rgba(255,255,255,0.8);
+        button {
+          width: 100%;
+          top: 50%;
+          transform: translateY(-50%);
+        }
+      }
       @media(max-height: 700px) {
         padding: 10vh 0 4vh;
       }

www/views/preferencesExternal.html

@@ -1,6 +1,6 @@
 <ion-view>
   <ion-nav-bar class="bar-royal">
-    <ion-nav-title>{{exteralSource}}</ion-nav-title>
+    <ion-nav-title>{{externalSource}}</ion-nav-title>
     <ion-nav-back-button>
     </ion-nav-back-button>
   </ion-nav-bar>

www/views/preferencesInformation.html

@@ -50,12 +50,6 @@
         </span>
         <i class="icon bp-arrow-right"></i>
       </a>
-      <div class="item" ng-show="wallet.isPrivKeyExternal()">
-        <span translate>Hardware Wallet</span>
-        <span class="item-note">
-        {{wallet.getPrivKeyExternalSourceName()}}
-        </span>
-      </div>
       <div class="item" ng-show="!wallet.isPrivKeyExternal() && !wallet.canSign()">
         <span translate></span>
         <span class="item-note">

www/views/tab-receive.html

@@ -53,19 +53,11 @@
         </div>
         <div class="row qr">
           <div class="text-center col center-block" copy-to-clipboard="addr" ng-repeat="wallet in wallets track by $index" ng-class="walletPosition($index)">
-
+            <span class="overlay" ng-show="shouldShowReceiveAddressFromHardware()">
-
+              <button class="button button-standard button-primary" ng-click="showReceiveAddressFromHardware()">
-            <span style="position: absolute; width: 220px" ng-show="shouldShowReceiveAddressFromHardware()">
-              <div style="width: 100%; height: 226px; background-color: rgba(255,255,255,0.8);">
-              <button class="button light-gray small round m10b"
-                style="background-color: white; border-color: black; color: black; top: 50%; transform: translateY(-50%);"
-                ng-click="showReceiveAddressFromHardware()">
                 <span translate>Show address</span>
               </button>
-              </div>
             </span>
-
-
             <qrcode ng-if="walletAddrs[wallet.id]" size="220" data="bitcoin:{{walletAddrs[wallet.id]}}" color="#334"></qrcode>
           </div>
         </div>