.

2016-08-24 18:08:00 -03:00 · 2016-08-24 18:08:00 -03:00 · 6743243bab
commit 6743243bab
parent 6764af0a40 a556f36f4c
24 changed files with 1177 additions and 968 deletions
--- a/src/js/controllers/buyGlidera.js
+++ b/src/js/controllers/buyGlidera.js
@ -1,26 +1,89 @@
 'use strict';

 angular.module('copayApp.controllers').controller('buyGlideraController',
-  function($scope, $timeout, $ionicModal, profileService, addressService, glideraService, bwcError, lodash, ongoingProcess) {
+  function($scope, $timeout, $log, $ionicModal, profileService, walletService, glideraService, bwcError, lodash, ongoingProcess) {

+    var wallet;
    var self = this;
    this.show2faCodeInput = null;
    this.error = null;
    this.success = null;

-    this.init = function(testnet) {
-      self.allWallets = profileService.getWallets(testnet ? 'testnet' : 'livenet');
+    $scope.init = function(accessToken) {
+      $scope.network = glideraService.getEnvironment();

-      var client = profileService.focusedClient;
-      if (client) {
+      $scope.token = accessToken;
+      $scope.error = null;
+      $scope.permissions = null;
+      $scope.email = null;
+      $scope.personalInfo = null;
+      $scope.txs = null;
+      $scope.status = null;
+      $scope.limits = null;
+
+      ongoingProcess.set('connectingGlidera', true);
+      glideraService.init($scope.token, function(err, glidera) {
+        ongoingProcess.set('connectingGlidera');
+        if (err || !glidera) {
+          $scope.error = err;
+          return;
+        }
+        $scope.token = glidera.token;
+        $scope.permissions = glidera.permissions;
+        $scope.update({fullUpdate: true});
+      });
+
+      self.allWallets = profileService.getWallets({
+        network: $scope.network,
+        n: 1,
+        onlyComplete: true
+      });
+      if (lodash.isEmpty(self.allWallets)) return;
+
+      wallet = self.allWallets[0];
+      if (wallet) {
        $timeout(function() {
-          self.selectedWalletId = client.credentials.walletId;
-          self.selectedWalletName = client.credentials.walletName;
+          self.selectedWalletId = wallet.credentials.walletId;
+          self.selectedWalletName = wallet.credentials.walletName;
          $scope.$apply();
        }, 100);
      }
    };

+    $scope.update = function(opts) {
+      if (!$scope.token || !$scope.permissions) return;
+      $log.debug('Updating Glidera Account...');
+      var accessToken = $scope.token;
+      var permissions = $scope.permissions;
+
+      opts = opts || {};
+
+      glideraService.getStatus(accessToken, function(err, data) {
+        $scope.status = data;
+      });
+
+      glideraService.getLimits(accessToken, function(err, limits) {
+        $scope.limits = limits;
+      });
+
+      if (permissions.transaction_history) {
+        glideraService.getTransactions(accessToken, function(err, data) {
+          $scope.txs = data;
+        });
+      }
+
+      if (permissions.view_email_address && opts.fullUpdate) {
+        glideraService.getEmail(accessToken, function(err, data) {
+          $scope.email = data.email;
+        });
+      }
+      if (permissions.personal_info && opts.fullUpdate) {
+        glideraService.getPersonalInfo(accessToken, function(err, data) {
+          $scope.personalInfo = data;
+        });
+      }
+    };
+
    $scope.openWalletsModal = function(wallets) {
      self.error = null;

@ -39,9 +102,9 @@ angular.module('copayApp.controllers').controller('buyGlideraController',

      $scope.$on('walletSelected', function(ev, walletId) {
        $timeout(function() {
-          var client = profileService.getClient(walletId);
+          wallet = profileService.getClient(walletId);
          self.selectedWalletId = walletId;
-          self.selectedWalletName = client.credentials.walletName;
+          self.selectedWalletName = wallet.credentials.walletName;
          $scope.$apply();
        }, 100);
        $scope.walletsModal.hide();
@ -87,7 +150,7 @@ angular.module('copayApp.controllers').controller('buyGlideraController',
      self.error = null;
      ongoingProcess.set('Buying Bitcoin...', true);
      $timeout(function() {
-        addressService.getAddress(self.selectedWalletId, false, function(err, walletAddr) {
+        walletService.getAddress(wallet, false, function(err, walletAddr) {
          if (err) {
            ongoingProcess.set('Buying Bitcoin...', false);
            self.error = bwcError.cb(err, 'Could not create address');
--- a/src/js/controllers/confirm.js
+++ b/src/js/controllers/confirm.js
@ -1,12 +1,12 @@
 'use strict';

-angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, walletService, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, profileService, bitcore, $ionicPopup, txStatus, gettext, txFormatService) {
+angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, walletService, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, profileService, bitcore, $ionicPopup, txStatus, gettext, txFormatService) {

  var cachedTxp = {};

  // An alert dialog
  var showAlert = function(title, msg, cb) {
-    $log.warn(title + ":" + msg);
+    $log.warn(title + ": " + msg);
    var alertPopup = $ionicPopup.alert({
      title: title,
      template: msg
@ -17,6 +17,29 @@ angular.module('copayApp.controllers').controller('confirmController', function(
    alertPopup.then(cb);
  };

+  $scope.showDescriptionPopup = function() {
+    var commentPopup = $ionicPopup.show({
+      templateUrl: "views/includes/note.html",
+      title: gettextCatalog.getString('Set description'),
+      scope: $scope,
+    });
+    $scope.commentPopupClose = function() {
+      commentPopup.close();
+    };
+    $scope.commentPopupSave = function() {
+      $log.debug('Saving description: ' + $scope.data.comment);
+      $scope.description = $scope.data.comment;
+      $scope.txp = null;
+
+      createTx($scope.wallet, $scope.toAddress, $scope.toAmount, $scope.data.comment, function(err, txp) {
+        if (err) return;
+        cachedTxp[$scope.wallet.id] = txp;
+        apply(txp);
+      });
+      commentPopup.close();
+    };
+  };
+
  $scope.init = function() {

    // TODO (URL , etc)
@ -67,17 +90,11 @@ angular.module('copayApp.controllers').controller('confirmController', function(
        stop = null;
      }

-      function apply(txp) {
-        $scope.fee = txFormatService.formatAmountStr(txp.fee);
-        $scope.txp = txp;
-        $scope.$apply();
-      };
-
      if (cachedTxp[wallet.id]) {
        apply(cachedTxp[wallet.id]);
      } else {
        stop = $timeout(function() {
-          createTx(wallet, $scope.toAddress, $scope.toAmount, $scope.comment, function(err, txp) {
+          createTx(wallet, $scope.toAddress, $scope.toAmount, $scope.description, function(err, txp) {
            if (err) return;
            cachedTxp[wallet.id] = txp;
            apply(txp);
@ -106,7 +123,13 @@ angular.module('copayApp.controllers').controller('confirmController', function(
    showAlert(gettext('Error creating transaction'), msg);
  };

-  var createTx = function(wallet, toAddress, toAmount, comment, cb) {
+  function apply(txp) {
+    $scope.fee = txFormatService.formatAmountStr(txp.fee);
+    $scope.txp = txp;
+    $scope.$apply();
+  };
+
+  var createTx = function(wallet, toAddress, toAmount, description, cb) {
    var config = configService.getSync().wallet;

    //
@ -117,7 +140,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
    var paypro = $scope.paypro;

    // ToDo: use a credential's (or fc's) function for this
-    if (comment && !wallet.credentials.sharedEncryptingKey) {
+    if (description && !wallet.credentials.sharedEncryptingKey) {
      var msg = 'Could not add message to imported wallet without shared encrypting key';
      $log.warn(msg);
      return setSendError(gettext(msg));
@ -132,7 +155,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
    outputs.push({
      'toAddress': toAddress,
      'amount': toAmount,
-      'message': comment
+      'message': description
    });

    var txp = {};
@ -145,7 +168,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
    }

    txp.outputs = outputs;
-    txp.message = comment;
+    txp.message = description;
    txp.payProUrl = paypro ? paypro.url : null;
    txp.excludeUnconfirmedUtxos = config.spendUnconfirmed ? false : true;
    txp.feeLevel = config.settings.feeLevel || 'normal';
--- a/src/js/controllers/glidera.js
+++ b/src/js/controllers/glidera.js
@ -1,33 +1,98 @@
 'use strict';

 angular.module('copayApp.controllers').controller('glideraController',
-  function($rootScope, $scope, $timeout, $ionicModal, profileService, configService, storageService, glideraService, lodash, ongoingProcess, platformInfo) {
+  function($rootScope, $scope, $timeout, $ionicModal, $log, profileService, storageService, glideraService, lodash, ongoingProcess, platformInfo, nodeWebkit) {

    if (platformInfo.isCordova && StatusBar.isVisible) {
      StatusBar.backgroundColorByHexString("#4B6178");
    }

+    $scope.openExternalLink = function(url, target) {
+      if (platformInfo.isNW) {
+        nodeWebkit.openExternalLink(url);
+      } else {
+        target = target || '_blank';
+        var ref = window.open(url, target, 'location=no');
+      }
+    };
+
+    $scope.init = function(accessToken) {
+      $scope.network = glideraService.getEnvironment();
+
+      $scope.token = null;
+      $scope.error = null;
+      $scope.permissions = null;
+      $scope.email = null;
+      $scope.personalInfo = null;
+      $scope.txs = null;
+      $scope.status = null;
+      $scope.limits = null;
+
+      ongoingProcess.set('connectingGlidera', true);
+      glideraService.init($scope.token, function(err, glidera) {
+        ongoingProcess.set('connectingGlidera');
+        if (err || !glidera) {
+          $scope.error = err;
+          return;
+        }
+        $scope.token = glidera.token;
+        $scope.permissions = glidera.permissions;
+        $scope.update({fullUpdate: true});
+      });
+    };
+
+    $scope.update = function(opts) {
+      if (!$scope.token || !$scope.permissions) return;
+      $log.debug('Updating Glidera Account...');
+      var accessToken = $scope.token;
+      var permissions = $scope.permissions;
+
+      opts = opts || {};
+
+      glideraService.getStatus(accessToken, function(err, data) {
+        $scope.status = data;
+      });
+
+      glideraService.getLimits(accessToken, function(err, limits) {
+        $scope.limits = limits;
+      });
+
+      if (permissions.transaction_history) {
+        glideraService.getTransactions(accessToken, function(err, data) {
+          $scope.txs = data;
+        });
+      }
+
+      if (permissions.view_email_address && opts.fullUpdate) {
+        glideraService.getEmail(accessToken, function(err, data) {
+          $scope.email = data.email;
+        });
+      }
+      if (permissions.personal_info && opts.fullUpdate) {
+        glideraService.getPersonalInfo(accessToken, function(err, data) {
+          $scope.personalInfo = data;
+        });
+      }
+    };
+
    this.getAuthenticateUrl = function() {
      return glideraService.getOauthCodeUrl();
    };

    this.submitOauthCode = function(code) {
-      var self = this;
-      var glideraTestnet = configService.getSync().glidera.testnet;
-      var network = glideraTestnet ? 'testnet' : 'livenet';
      ongoingProcess.set('connectingGlidera', true);
-      this.error = null;
+      $scope.error = null;
      $timeout(function() {
        glideraService.getToken(code, function(err, data) {
          ongoingProcess.set('connectingGlidera', false);
          if (err) {
-            self.error = err;
+            $scope.error = err;
            $timeout(function() {
              $scope.$apply();
            }, 100);
          } else if (data && data.access_token) {
-            storageService.setGlideraToken(network, data.access_token, function() {
-              $scope.$emit('Local/GlideraUpdated', data.access_token);
+            storageService.setGlideraToken($scope.network, data.access_token, function() {
+              $scope.init(data.access_token);
              $timeout(function() {
                $scope.$apply();
              }, 100);
--- a/src/js/controllers/import.js
+++ b/src/js/controllers/import.js
@ -1,7 +1,7 @@
 'use strict';

 angular.module('copayApp.controllers').controller('importController',
-  function($scope, $rootScope, $timeout, $log, profileService, configService, notification, sjcl, gettext, ledger, trezor, derivationPathHelper, platformInfo, bwcService, ongoingProcess, walletService) {
+  function($scope, $rootScope, $timeout, $log, $state, profileService, configService, sjcl, gettext, ledger, trezor, derivationPathHelper, platformInfo, bwcService, ongoingProcess, walletService) {

    var isChromeApp = platformInfo.isChromeApp;
    var isDevel = platformInfo.isDevel;
@ -110,7 +110,6 @@ angular.module('copayApp.controllers').controller('importController',
          });

          $rootScope.$emit('Local/WalletImported', client.credentials.walletId);
-          notification.success(gettext('Success'), gettext('Your wallet has been imported correctly'));
          $state.go('tabs.home');
        });
      }, 100);
@ -138,7 +137,6 @@ angular.module('copayApp.controllers').controller('importController',
          });

          $rootScope.$emit('Local/WalletImported', client.credentials.walletId);
-          notification.success(gettext('Success'), gettext('Your wallet has been imported correctly'));
          $state.go('tabs.home');
        });
      }, 100);
@ -159,7 +157,6 @@ angular.module('copayApp.controllers').controller('importController',
            });
          }
          $rootScope.$emit('Local/WalletImported', walletId);
-          notification.success(gettext('Success'), gettext('Your wallet has been imported correctly'));
          $state.go('tabs.home');
        });
      }, 100);
@ -189,7 +186,6 @@ angular.module('copayApp.controllers').controller('importController',
          });

          $rootScope.$emit('Local/WalletImported', client.credentials.walletId);
-          notification.success(gettext('Success'), gettext('Your wallet has been imported correctly'));
          $state.go('tabs.home');
        });
      }, 100);
@ -324,7 +320,6 @@ angular.module('copayApp.controllers').controller('importController',
            $log.debug('Remote preferences saved for:' + wallet.walletId)
          });
          $rootScope.$emit('Local/WalletImported', wallet.walletId);
-          notification.success(gettext('Success'), gettext('Your wallet has been imported correctly'));
          $state.go('tabs.home');
        });
      }, 100);
@ -402,7 +397,6 @@ angular.module('copayApp.controllers').controller('importController',
            $log.debug('Remote preferences saved for:' + wallet.walletId)
          });
          $rootScope.$emit('Local/WalletImported', wallet.walletId);
-          notification.success(gettext('Success'), gettext('Your wallet has been imported correctly'));
          $state.go('tabs.home');
        });
      }, 100);
--- a/src/js/controllers/join.js
+++ b/src/js/controllers/join.js
@ -1,7 +1,7 @@
 'use strict';

 angular.module('copayApp.controllers').controller('joinController',
-  function($scope, $rootScope, $timeout, $state, notification, profileService, configService, storageService, applicationService, gettext, lodash, ledger, trezor, platformInfo, derivationPathHelper, ongoingProcess, walletService, $log) {
+  function($scope, $rootScope, $timeout, $state, profileService, configService, storageService, applicationService, gettext, lodash, ledger, trezor, platformInfo, derivationPathHelper, ongoingProcess, walletService, $log) {

    var isChromeApp = platformInfo.isChromeApp;
    var isDevel = platformInfo.isDevel;
--- a/src/js/controllers/modals/glideraConfirmation.js
+++ b/src/js/controllers/modals/glideraConfirmation.js
@ -1,11 +1,11 @@
 'use strict';

-angular.module('copayApp.controllers').controller('glideraConfirmationController', function($scope, $timeout, storageService, applicationService) {
+angular.module('copayApp.controllers').controller('glideraConfirmationController', function($scope, $timeout, $state, glideraService) {

  $scope.ok = function() {
-    storageService.removeGlideraToken($scope.network, function() {
+    glideraService.removeToken(function() {
      $timeout(function() {
-        applicationService.restart();
+        $state.go('glidera.main');
      }, 100);
    });
    $scope.cancel();
--- a/src/js/controllers/preferencesGlidera.js
+++ b/src/js/controllers/preferencesGlidera.js
@ -1,43 +1,70 @@
 'use strict';

 angular.module('copayApp.controllers').controller('preferencesGlideraController',
-  function($scope, $timeout, $ionicModal, profileService, applicationService, glideraService, storageService) {
+  function($scope, $log, $ionicModal, ongoingProcess, glideraService) {

-    this.getEmail = function(token) {
-      var self = this;
-      glideraService.getEmail(token, function(error, data) {
-        self.email = data;
+    $scope.init = function(accessToken) {
+      $scope.network = glideraService.getEnvironment();
+
+      $scope.token = accessToken;
+      $scope.error = null;
+      $scope.permissions = null;
+      $scope.email = null;
+      $scope.personalInfo = null;
+      $scope.txs = null;
+      $scope.status = null;
+      $scope.limits = null;
+
+      ongoingProcess.set('connectingGlidera', true);
+      glideraService.init($scope.token, function(err, glidera) {
+        ongoingProcess.set('connectingGlidera');
+        if (err || !glidera) {
+          $scope.error = err;
+          return;
+        }
+        $scope.token = glidera.token;
+        $scope.permissions = glidera.permissions;
+        $scope.update({fullUpdate: true});
      });
    };

-    this.getPersonalInfo = function(token) {
-      var self = this;
-      glideraService.getPersonalInfo(token, function(error, info) {
-        self.personalInfo = info;
+    $scope.update = function(opts) {
+      if (!$scope.token || !$scope.permissions) return;
+      $log.debug('Updating Glidera Account...');
+      var accessToken = $scope.token;
+      var permissions = $scope.permissions;
+
+      opts = opts || {};
+
+      glideraService.getStatus(accessToken, function(err, data) {
+        $scope.status = data;
      });
+
+      glideraService.getLimits(accessToken, function(err, limits) {
+        $scope.limits = limits;
+      });
+
+      if (permissions.transaction_history) {
+        glideraService.getTransactions(accessToken, function(err, data) {
+          $scope.txs = data;
+        });
+      }
+
+      if (permissions.view_email_address && opts.fullUpdate) {
+        glideraService.getEmail(accessToken, function(err, data) {
+          $scope.email = data.email;
+        });
+      }
+      if (permissions.personal_info && opts.fullUpdate) {
+        glideraService.getPersonalInfo(accessToken, function(err, data) {
+          $scope.personalInfo = data;
+        });
+      }
    };

-    this.getStatus = function(token) {
-      var self = this;
-      glideraService.getStatus(token, function(error, data) {
-        self.status = data;
-      });
-    };
-
-    this.getLimits = function(token) {
-      var self = this;
-      glideraService.getLimits(token, function(error, limits) {
-        self.limits = limits;
-      });
-    };
-
-    this.revokeToken = function(testnet) {
-      $scope.network = testnet ? 'testnet' : 'livenet';
-      $scope.loading = false;
-
+    $scope.revokeToken = function() {
      $ionicModal.fromTemplateUrl('views/modals/glidera-confirmation.html', {
-        scope: $scope,
-        animation: 'slide-in-up'
+        scope: $scope
      }).then(function(modal) {
        $scope.glideraConfirmationModal = modal;
        $scope.glideraConfirmationModal.show();
--- a/src/js/controllers/sellGlidera.js
+++ b/src/js/controllers/sellGlidera.js
@ -1,38 +1,97 @@
 'use strict';

 angular.module('copayApp.controllers').controller('sellGlideraController',
-  function($rootScope, $scope, $timeout, $ionicModal, $log, configService, profileService, addressService, feeService, glideraService, bwcError, lodash, walletService, fingerprintService, ongoingProcess, go) {
+  function($rootScope, $scope, $timeout, $ionicModal, $log, profileService, glideraService, bwcError, lodash, walletService, fingerprintService, configService, ongoingProcess) {

    var self = this;
-    var config = configService.getSync();
    this.data = {};
    this.show2faCodeInput = null;
    this.success = null;
    this.error = null;
-    var client;
+    var wallet;

-    var handleEncryptedWallet = function(client, cb) {
-      if (!walletService.isEncrypted(client)) return cb();
+    var handleEncryptedWallet = function(wallet, cb) {
+      if (!walletService.isEncrypted(wallet)) return cb();
      $rootScope.$emit('Local/NeedsPassword', false, function(err, password) {
        if (err) return cb(err);
-        return cb(walletService.unlock(client, password));
+        return cb(walletService.unlock(wallet, password));
      });
    };

-    this.init = function(testnet) {
-      self.allWallets = profileService.getWallets(testnet ? 'testnet' : 'livenet', 1);
+    $scope.init = function(accessToken) {
+      $scope.network = glideraService.getEnvironment();

-      client = profileService.focusedClient;
-      if (client && client.credentials.m == 1) {
+      $scope.token = accessToken;
+      $scope.error = null;
+      $scope.permissions = null;
+      $scope.email = null;
+      $scope.personalInfo = null;
+      $scope.txs = null;
+      $scope.status = null;
+      $scope.limits = null;
+
+      ongoingProcess.set('connectingGlidera', true);
+      glideraService.init($scope.token, function(err, glidera) {
+        ongoingProcess.set('connectingGlidera');
+        if (err || !glidera) {
+          $scope.error = err;
+          return;
+        }
+        $scope.token = glidera.token;
+        $scope.permissions = glidera.permissions;
+        $scope.update({fullUpdate: true});
+      });
+
+      self.allWallets = profileService.getWallets({
+        network: $scope.network,
+        n: 1,
+        onlyComplete: true
+      });
+      if (lodash.isEmpty(self.allWallets)) return;
+
+      wallet = self.allWallets[0];
+      if (wallet) {
        $timeout(function() {
-          self.selectedWalletId = client.credentials.walletId;
-          self.selectedWalletName = client.credentials.walletName;
+          self.selectedWalletId = wallet.credentials.walletId;
+          self.selectedWalletName = wallet.credentials.walletName;
          $scope.$apply();
        }, 100);
      }
    };

+    $scope.update = function(opts) {
+      if (!$scope.token || !$scope.permissions) return;
+      $log.debug('Updating Glidera Account...');
+      var accessToken = $scope.token;
+      var permissions = $scope.permissions;

+      opts = opts || {};
+
+      glideraService.getStatus(accessToken, function(err, data) {
+        $scope.status = data;
+      });
+
+      glideraService.getLimits(accessToken, function(err, limits) {
+        $scope.limits = limits;
+      });
+
+      if (permissions.transaction_history) {
+        glideraService.getTransactions(accessToken, function(err, data) {
+          $scope.txs = data;
+        });
+      }
+
+      if (permissions.view_email_address && opts.fullUpdate) {
+        glideraService.getEmail(accessToken, function(err, data) {
+          $scope.email = data.email;
+        });
+      }
+      if (permissions.personal_info && opts.fullUpdate) {
+        glideraService.getPersonalInfo(accessToken, function(err, data) {
+          $scope.personalInfo = data;
+        });
+      }
+    };

    $scope.openWalletsModal = function(wallets) {
      self.error = null;
@ -52,9 +111,9 @@ angular.module('copayApp.controllers').controller('sellGlideraController',

      $scope.$on('walletSelected', function(ev, walletId) {
        $timeout(function() {
-          client = profileService.getClient(walletId);
+          wallet = profileService.getClient(walletId);
          self.selectedWalletId = walletId;
-          self.selectedWalletName = client.credentials.walletName;
+          self.selectedWalletName = wallet.credentials.walletName;
          $scope.$apply();
        }, 100);
        $scope.walletsModal.hide();
@ -98,16 +157,17 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
      var self = this;
      self.error = null;
      var outputs = [];
+      var config = configService.getSync();
      var configWallet = config.wallet;
      var walletSettings = configWallet.settings;

-      if (!client) {
+      if (!wallet) {
        self.error = 'No wallet selected';
        return;
      }

      ongoingProcess.set('creatingTx', true);
-      addressService.getAddress(client.credentials.walletId, null, function(err, refundAddress) {
+      walletService.getAddress(wallet, null, function(err, refundAddress) {
        if (!refundAddress) {

          ongoingProcess.clear();
@ -142,71 +202,62 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
            }
          };

-          walletService.createTx(client, txp, function(err, createdTxp) {
+          walletService.createTx(wallet, txp, function(err, createdTxp) {
            ongoingProcess.clear();
            if (err) {
              self.error = err.message ||  bwcError.msg(err);
              return;
            }
-            $scope.$emit('Local/NeedsConfirmation', createdTxp, function(accept) {
-              if (accept) {
-                fingerprintService.check(client, function(err) {
+            fingerprintService.check(wallet, function(err) {
+              if (err) {
+                self.error = err.message ||  bwcError.msg(err);
+                return;
+              }
+
+              handleEncryptedWallet(wallet, function(err) {
+                if (err) {
+                  self.error = err.message ||  bwcError.msg(err);
+                  return;
+                }
+
+                ongoingProcess.set('signingTx', true);
+                walletService.publishTx(wallet, createdTxp, function(err, publishedTxp) {
                  if (err) {
+                    ongoingProcess.clear();
                    self.error = err.message ||  bwcError.msg(err);
-                    return;
                  }

-                  handleEncryptedWallet(client, function(err) {
+                  walletService.signTx(wallet, publishedTxp, function(err, signedTxp) {
+                    walletService.lock(wallet);
+                    walletService.removeTx(wallet, signedTxp, function(err) {
+                      if (err) $log.debug(err);
+                    });
+                    ongoingProcess.clear();
                    if (err) {
                      self.error = err.message ||  bwcError.msg(err);
                      return;
                    }
-
-                    ongoingProcess.set('signingTx', true);
-                    walletService.publishTx(client, createdTxp, function(err, publishedTxp) {
+                    var rawTx = signedTxp.raw;
+                    var data = {
+                      refundAddress: refundAddress,
+                      signedTransaction: rawTx,
+                      priceUuid: self.sellPrice.priceUuid,
+                      useCurrentPrice: self.sellPrice.priceUuid ? false : true,
+                      ip: null
+                    };
+                    ongoingProcess.set('Seling Bitcoin', true);
+                    glideraService.sell(token, twoFaCode, data, function(err, data) {
+                      ongoingProcess.clear();
                      if (err) {
-                        ongoingProcess.clear();
                        self.error = err.message ||  bwcError.msg(err);
+                        return;
                      }
-
-                      walletService.signTx(client, publishedTxp, function(err, signedTxp) {
-                        walletService.lock(client);
-                        walletService.removeTx(client, signedTxp, function(err) {
-                          if (err) $log.debug(err);
-                        });
-                        ongoingProcess.clear();
-                        if (err) {
-                          self.error = err.message ||  bwcError.msg(err);
-                          return;
-                        }
-                        var rawTx = signedTxp.raw;
-                        var data = {
-                          refundAddress: refundAddress,
-                          signedTransaction: rawTx,
-                          priceUuid: self.sellPrice.priceUuid,
-                          useCurrentPrice: self.sellPrice.priceUuid ? false : true,
-                          ip: null
-                        };
-                        ongoingProcess.set('Seling Bitcoin', true);
-                        glideraService.sell(token, twoFaCode, data, function(err, data) {
-                          ongoingProcess.clear();
-                          if (err) {
-                            self.error = err.message ||  bwcError.msg(err);
-                            $timeout(function() {
-                              $scope.$emit('Local/GlideraError');
-                            }, 100);
-                            return;
-                          }
-                          self.success = data;
-                          $scope.$emit('Local/GlideraTx');
-                        });
-                      });
+                      self.success = data;
+                      $scope.update();
                    });
                  });
                });
-              } else {
-                go.path('glidera');
-              }
+              });
            });
          });
        });
--- a/src/js/controllers/tab-home.js
+++ b/src/js/controllers/tab-home.js
@ -93,10 +93,9 @@ angular.module('copayApp.controllers').controller('tabHomeController',

    configService.whenAvailable(function() {
      var config = configService.getSync();
-      var glideraEnabled = config.glidera.enabled;
-      var coinbaseEnabled = config.coinbase.enabled;
      var isWindowsPhoneApp = platformInfo.isWP && isCordova;
-      $scope.buyAndSellEnabled = !isWindowsPhoneApp && (glideraEnabled || coinbaseEnabled);
+      $scope.glideraEnabled = config.glidera.enabled && !isWindowsPhoneApp;
+      $scope.coinbaseEnabled = config.coinbase.enabled && !isWindowsPhoneApp;
    });

  });