diff --git a/public/views/buyGlidera.html b/public/views/buyGlidera.html index d81b7931b..ca3009015 100644 --- a/public/views/buyGlidera.html +++ b/public/views/buyGlidera.html @@ -27,12 +27,12 @@
Daily buy limit: - ${{index.glideraLimits.dailyBuy}} - (remaining ${{index.glideraLimits.dailyBuyRemaining}}) + {{index.glideraLimits.dailyBuy|currency:'':2}} {{index.glideraLimits.currency}} + (remaining {{index.glideraLimits.dailyBuyRemaining|currency:'':2}} {{index.glideraLimits.currency}})
Monthly buy limit: - ${{index.glideraLimits.monthlyBuy}} - (remaining ${{index.glideraLimits.monthlyBuyRemaining}}) + {{index.glideraLimits.monthlyBuy|currency:'':2}} {{index.glideraLimits.currency}} + (remaining {{index.glideraLimits.monthlyBuyRemaining|currency:'':2}} {{index.glideraLimits.currency}})
@@ -67,7 +67,7 @@
Buy - {{buy.buyPrice.currency}} {{buy.buyPrice.subtotal}} in Bitcoin + {{buy.buyPrice.subtotal|currency:'':2}} {{buy.buyPrice.currency}} in Bitcoin {{buy.buyPrice.qty}} BTC at {{buy.buyPrice.price}} {{buy.buyPrice.currency}}/BTC
@@ -88,7 +88,7 @@
- {{buy.buyPrice.currency}} {{buy.buyPrice.subtotal}} → {{buy.buyPrice.qty}} BTC + {{buy.buyPrice.subtotal|currency:'':2}} {{buy.buyPrice.currency}} → {{buy.buyPrice.qty}} BTC

A SMS containing a confirmation code was sent to your phone.
Please, enter the code below diff --git a/public/views/glidera.html b/public/views/glidera.html index c222eef6b..d19250c7a 100644 --- a/public/views/glidera.html +++ b/public/views/glidera.html @@ -165,7 +165,7 @@

- {{tx.subtotal}} {{tx.currency}} + {{tx.subtotal|currency:'':2}} {{tx.currency}}
diff --git a/public/views/modals/glidera-confirmation.html b/public/views/modals/glidera-confirmation.html index 11f007613..61bfa5c9c 100644 --- a/public/views/modals/glidera-confirmation.html +++ b/public/views/modals/glidera-confirmation.html @@ -1,15 +1,16 @@
-

Revoke Glidera Token

-
- -
-
- -
+

Are you sure you would like to log out of your Glidera account?

+

You will need to log back in to buy or sell bitcoin in Copay.

+
+ +
+
+ +
diff --git a/public/views/modals/glidera-tx-details.html b/public/views/modals/glidera-tx-details.html index ca7396496..0725e2de6 100644 --- a/public/views/modals/glidera-tx-details.html +++ b/public/views/modals/glidera-tx-details.html @@ -18,7 +18,7 @@ ng-style="{'background-color':color}" translate>Bought Sold
- {{tx.subtotal}} {{tx.currency}} + {{tx.subtotal|currency:'':2}} {{tx.currency}}
Completed @@ -32,28 +32,30 @@
  • - Date: + Date {{tx.transactionDate | amCalendar}}
  • - Price: - ${{tx.price}} {{tx.currency}} + Exchange rate + {{tx.price|currency:'':2}} {{tx.currency}}/BTC
    • - +
+

 

+
  • - Subtotal: - ${{tx.subtotal}} {{tx.currency}} + Subtotal + {{tx.subtotal|currency:'':2}} {{tx.currency}}
  • - Fees: - ${{tx.fees}} {{tx.currency}} + Fees + {{tx.fees|currency:'':2}} {{tx.currency}}
    • -
  • - Total: - ${{tx.total}} {{tx.currency}} +
  • + Total + {{tx.total|currency:'':2}} {{tx.currency}}
diff --git a/public/views/preferencesGlidera.html b/public/views/preferencesGlidera.html index 4cffa4fd5..818dd4b91 100644 --- a/public/views/preferencesGlidera.html +++ b/public/views/preferencesGlidera.html @@ -199,49 +199,49 @@
  • Daily Buy - {{glidera.limits.dailyBuy}} {{glidera.limits.currency}} + {{glidera.limits.dailyBuy|currency:'':2}} {{glidera.limits.currency}}
  • Daily Sell - {{glidera.limits.dailySell}} {{glidera.limits.currency}} + {{glidera.limits.dailySell|currency:'':2}} {{glidera.limits.currency}}
  • Monthly Buy - {{glidera.limits.monthlyBuy}} {{glidera.limits.currency}} + {{glidera.limits.monthlyBuy|currency:'':2}} {{glidera.limits.currency}}
  • Monthly Sell - {{glidera.limits.monthlySell}} {{glidera.limits.currency}} + {{glidera.limits.monthlySell|currency:'':2}} {{glidera.limits.currency}}
  • Daily Buy Remaining - {{glidera.limits.dailyBuyRemaining}} {{glidera.limits.currency}} + {{glidera.limits.dailyBuyRemaining|currency:'':2}} {{glidera.limits.currency}}
  • Daily Sell Remaining - {{glidera.limits.dailySellRemaining}} {{glidera.limits.currency}} + {{glidera.limits.dailySellRemaining|currency:'':2}} {{glidera.limits.currency}}
  • Monthly Buy Remaining - {{glidera.limits.monthlyBuyRemaining}} {{glidera.limits.currency}} + {{glidera.limits.monthlyBuyRemaining|currency:'':2}} {{glidera.limits.currency}}
  • Monthly Sell Remaining - {{glidera.limits.monthlySellRemaining}} {{glidera.limits.currency}} + {{glidera.limits.monthlySellRemaining|currency:'':2}} {{glidera.limits.currency}}
  • @@ -257,7 +257,7 @@
  • - Revoke Token + Log out
    • diff --git a/public/views/sellGlidera.html b/public/views/sellGlidera.html index 4f927ba8f..2e9a8f973 100644 --- a/public/views/sellGlidera.html +++ b/public/views/sellGlidera.html @@ -27,12 +27,12 @@
    Daily sell limit: - ${{index.glideraLimits.dailySell}} - (${{index.glideraLimits.dailySellRemaining}} remaining) + {{index.glideraLimits.dailySell|currency:'':2}} {{index.glideraLimits.currency}} + (remaining {{index.glideraLimits.dailySellRemaining|currency:'':2}} {{index.glideraLimits.currency}})
    Monthly sell limit: - ${{index.glideraLimits.monthlySell}} - (${{index.glideraLimits.monthlySellRemaining}} remaining) + {{index.glideraLimits.monthlySell|currency:'':2}} {{index.glideraLimits.currency}} + (remaining {{index.glideraLimits.monthlySellRemaining|currency:'':2}} {{index.glideraLimits.currency}})
    @@ -67,9 +67,9 @@
    Sell - {{sell.sellPrice.currency}} {{sell.sellPrice.subtotal}} in Bitcoin + {{sell.sellPrice.subtotal|currency:'':2}} {{sell.sellPrice.currency}} in Bitcoin {{sell.sellPrice.qty}} BTC - at {{sell.sellPrice.price}} {{sell.sellPrice.currency}}/BTC + at {{sell.sellPrice.price|currency:'':2}} {{sell.sellPrice.currency}}/BTC
    @@ -89,7 +89,7 @@
    -{{sell.sellPrice.qty}} BTC → {{sell.sellPrice.currency}} {{sell.sellPrice.subtotal}} +{{sell.sellPrice.qty}} BTC → {{sell.sellPrice.subtotal|currency:'':2}} {{sell.sellPrice.currency}}

    A SMS containing a confirmation code was sent to your phone.
    Please, enter the code below diff --git a/src/js/controllers/buyGlidera.js b/src/js/controllers/buyGlidera.js index 5b4724fb0..2aaf7cbe7 100644 --- a/src/js/controllers/buyGlidera.js +++ b/src/js/controllers/buyGlidera.js @@ -11,6 +11,7 @@ angular.module('copayApp.controllers').controller('buyGlideraController', this.getBuyPrice = function(token, price) { var self = this; + this.error = null; if (!price || (price && !price.qty && !price.fiat)) { this.buyPrice = null; return; diff --git a/src/js/controllers/preferencesGlidera.js b/src/js/controllers/preferencesGlidera.js index 43d270f31..b90ae39c0 100644 --- a/src/js/controllers/preferencesGlidera.js +++ b/src/js/controllers/preferencesGlidera.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesGlideraController', - function($scope, $modal, $timeout, profileService, applicationService, glideraService, storageService) { + function($scope, $modal, $timeout, profileService, applicationService, glideraService, storageService, isChromeApp) { this.getEmail = function(token) { var self = this; @@ -31,6 +31,14 @@ angular.module('copayApp.controllers').controller('preferencesGlideraController' }); }; + // DISABLE ANIMATION ON CHROMEAPP + if (isChromeApp) { + var animatedSlideRight = 'full'; + } + else { + var animatedSlideRight = 'full animated slideInRight'; + } + this.revokeToken = function() { var fc = profileService.focusedClient; var ModalInstanceCtrl = function($scope, $modalInstance) { @@ -44,9 +52,10 @@ angular.module('copayApp.controllers').controller('preferencesGlideraController' var modalInstance = $modal.open({ templateUrl: 'views/modals/glidera-confirmation.html', - windowClass: 'full', + windowClass: animatedSlideRight, controller: ModalInstanceCtrl }); + modalInstance.result.then(function(ok) { if (ok) { storageService.removeGlideraToken(fc.credentials.network, function() { @@ -56,6 +65,11 @@ angular.module('copayApp.controllers').controller('preferencesGlideraController' }); } }); + + modalInstance.result.finally(function() { + var m = angular.element(document.getElementsByClassName('reveal-modal')); + m.addClass('slideOutRight'); + }); }; }); diff --git a/src/js/controllers/sellGlidera.js b/src/js/controllers/sellGlidera.js index 0fd2308c8..4d6622055 100644 --- a/src/js/controllers/sellGlidera.js +++ b/src/js/controllers/sellGlidera.js @@ -14,8 +14,8 @@ angular.module('copayApp.controllers').controller('sellGlideraController', this.getSellPrice = function(token, price) { var self = this; + this.error = null; if (!price || (price && !price.qty && !price.fiat)) { - this.error = null; this.sellPrice = null; return; }