diff --git a/public/views/buyGlidera.html b/public/views/buyGlidera.html index 05cbc0686..877c8a85d 100644 --- a/public/views/buyGlidera.html +++ b/public/views/buyGlidera.html @@ -5,7 +5,7 @@ -
+
@@ -20,8 +20,32 @@
-
+
+

+
+ +
+
+ Daily buy limit: + ${{index.glideraLimits.dailyBuy}} + (remaining ${{index.glideraLimits.dailyBuyRemaining}}) +
+ Monthly buy limit: + ${{index.glideraLimits.monthlyBuy}} + (remaining ${{index.glideraLimits.monthlyBuyRemaining}}) +
+

+
+ +
+ +
+ + This operation was disabled because you have a pending first transaction + +
+
@@ -50,7 +74,8 @@ + type="submit" value="{{'Continue'|translate}}" + ng-disabled="index.glideraLimits.transactDisabledPendingFirstTransaction || !buy.buyPrice.qty || buy.loading">
diff --git a/public/views/glidera.html b/public/views/glidera.html index b9cfd4ebd..bcf62147a 100644 --- a/public/views/glidera.html +++ b/public/views/glidera.html @@ -78,12 +78,11 @@
-
+
- {{index.glideraEmail}} - (Unconfirmed) + {{index.glideraEmail}}
@@ -91,9 +90,9 @@
- Your Glidera account is not ready to transact. Please, verify it at + ng-show="index.glideraStatus && (!index.glideraStatus.userEmailIsSetup || !index.glideraStatus.userPhoneIsSetup + || (!index.glideraStatus.userBankAccountIsSetup && index.glideraStatus.bankAccountState != 'VERIFIED'))"> + Your Glidera account is not ready to transact. Please, verify it at -
+
@@ -20,9 +20,32 @@
-
+
+

+
+ +
+
+ Daily sell limit: + ${{index.glideraLimits.dailySell}} + (remaining ${{index.glideraLimits.dailySellRemaining}}) +
+ Monthly sell limit: + ${{index.glideraLimits.monthlySell}} + (remaining ${{index.glideraLimits.monthlySellRemaining}}) +
+

+
+ +
+
+ + This operation was disabled because you have a pending first transaction + +
+
@@ -51,7 +74,8 @@ + type="submit" value="{{'Continue'|translate}}" + ng-disabled="index.glideraLimits.transactDisabledPendingFirstTransaction || !sell.sellPrice.qty || sell.loading">
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 8b4e6e29f..3a39f0c1b 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -871,11 +871,13 @@ console.log('[index.js:395]',txps); //TODO self.updateGlidera = function(accessToken, permissions) { if (!accessToken || !permissions) return; - self.glideraStatusLoaded = false; glideraService.getStatus(accessToken, function(err, data) { - self.glideraStatusLoaded = true; self.glideraStatus = data; }); + + glideraService.getLimits(accessToken, function(err, limits) { + self.glideraLimits = limits; + }); if (permissions.view_email_address) { self.glideraLoadingEmail = gettext('Getting Glidera Email...');