From 057cc22cdfad5ce9e2cfc7899664700ff22f41af Mon Sep 17 00:00:00 2001 From: Malika Date: Mon, 11 May 2015 10:17:54 -0700 Subject: [PATCH] [FIX] USD and BTC gateway pages (RT-3422) --- src/js/tabs/btc.controller.js | 6 +++--- src/js/tabs/usd.controller.js | 6 +++--- src/templates/tabs/btc.jade | 16 ++++++++-------- src/templates/tabs/usd.jade | 16 ++++++++-------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/js/tabs/btc.controller.js b/src/js/tabs/btc.controller.js index 0f60ac5f4..811e9373e 100644 --- a/src/js/tabs/btc.controller.js +++ b/src/js/tabs/btc.controller.js @@ -192,7 +192,7 @@ BtcTab.prototype.angular = function (module) console.warn('Unhandled engine status encountered!'); } if ($scope.btc_tx_result=="cleared"){ - $scope.btcConnected = true; + $scope.btc2Connected = true; $scope.showBtcInstructions = true; } @@ -219,10 +219,10 @@ BtcTab.prototype.angular = function (module) $scope.$watch('lines', function () { if($scope.lines['rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59BBTC']){ - $scope.btcConnected = true; + $scope.btc2Connected = true; } else { - $scope.btcConnected = false; + $scope.btc2Connected = false; } }, true); diff --git a/src/js/tabs/usd.controller.js b/src/js/tabs/usd.controller.js index 8e0eaa31d..6f260742d 100644 --- a/src/js/tabs/usd.controller.js +++ b/src/js/tabs/usd.controller.js @@ -206,7 +206,7 @@ UsdTab.prototype.angular = function (module) console.warn('Unhandled engine status encountered!'); } if ($scope.usd_tx_result=="cleared"){ - $scope.usdConnected = true; + $scope.usd2Connected = true; $scope.showUsdInstructions = true; } @@ -240,10 +240,10 @@ UsdTab.prototype.angular = function (module) $scope.usdConnected = false; } if($scope.lines['rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59BUSD']){ - $scope.usdConnected = true; + $scope.usd2Connected = true; } else { - $scope.usdConnected = false; + $scope.usd2Connected = false; } }, true); diff --git a/src/templates/tabs/btc.jade b/src/templates/tabs/btc.jade index 9d31d9c27..6dd9fca04 100644 --- a/src/templates/tabs/btc.jade +++ b/src/templates/tabs/btc.jade @@ -157,24 +157,24 @@ section.col-xs-12.content(ng-controller='BtcCtrl') .row.fund-tab-description .col-xs-12.col-md-8.col-lg-6 - .descriptor(ng-show="!btcConnected", l10n) Ripple Trade has partnered with Bitstamp to provide easier access to BTC. Following this action will enable Bitstamp to hold BTC on your behalf. + .descriptor(ng-show="!btc2Connected", l10n) Ripple Trade has partnered with Bitstamp to provide easier access to BTC. Following this action will enable Bitstamp to hold BTC on your behalf. .row.fund-tab-description .col-xs-7.col-sm-5.col-md-4 - button.btn.btn-large.btn-primary(ng-show="!btcConnected && !btcLoading && loadState.account", type="submit", ng-click="save_btc_account()", ng-disabled="!account.Balance || !can_add_trust", l10n) Add Bitstamp - button.btn.btn-large.btn-primary(ng-show="!btcConnected && btcLoading", type="submit", ng-disabled="btcLoading", l10n) Adding... - button.btn.btn-large.btn-primary(ng-show="showBtcInstructions && btcConnected", type="submit", ng-click="toggle_btc_instructions()", l10n) Hide instructions - button.btn.btn-large.btn-primary(ng-show="btcConnected && !showBtcInstructions", type="submit", ng-click="toggle_btc_instructions()", l10n) Show instructions + button.btn.btn-large.btn-primary(ng-show="!btc2Connected && !btcLoading && loadState.account", type="submit", ng-click="save_btc_account()", ng-disabled="!account.Balance || !can_add_trust", l10n) Add Bitstamp + button.btn.btn-large.btn-primary(ng-show="!btc2Connected && btcLoading", type="submit", ng-disabled="btcLoading", l10n) Adding... + button.btn.btn-large.btn-primary(ng-show="showBtcInstructions && btc2Connected", type="submit", ng-click="toggle_btc_instructions()", l10n) Hide instructions + button.btn.btn-large.btn-primary(ng-show="btc2Connected && !showBtcInstructions", type="submit", ng-click="toggle_btc_instructions()", l10n) Show instructions .connect.col-xs-5.col-sm-7.col-md-8(ng-hide="btcLoading") - .description.fa.fa-times(ng-show="!btcConnected && account.Balance", l10n) Not connected - .description.fa.fa-check(ng-show="btcConnected && account.Balance", l10n) Connected + .description.fa.fa-times(ng-show="!btc2Connected && account.Balance", l10n) Not connected + .description.fa.fa-check(ng-show="btc2Connected && account.Balance", l10n) Connected .description(ng-show="!account.Balance && loadState.account", l10n) Your account has to be activated before you can add a gateway account. .description(ng-show="!loadState.account") img(src="img/button-s.png", class="loader") span(class="loading_text", l10n) Loading... - .row(ng-show="showBtcInstructions && btcConnected") + .row(ng-show="showBtcInstructions && btc2Connected") .instructions.col-md-10 a.dismiss(href="", id="hide", ng-click="toggle_btc_instructions()", l10n) × .title(l10n) NEW CUSTOMERS- SIGN UP AT BITSTAMP diff --git a/src/templates/tabs/usd.jade b/src/templates/tabs/usd.jade index 5bfa84691..a3a0808f0 100644 --- a/src/templates/tabs/usd.jade +++ b/src/templates/tabs/usd.jade @@ -134,24 +134,24 @@ section.col-xs-12.content(ng-controller='UsdCtrl') .row.fund-tab-description .col-xs-12.col-md-8.col-lg-6 - .descriptor(ng-show="!usdConnected", l10n) Ripple Trade has partnered with Bitstamp to provide easier access to USD. Following this action will enable Bitstamp to hold USD on your behalf. + .descriptor(ng-show="!usd2Connected", l10n) Ripple Trade has partnered with Bitstamp to provide easier access to USD. Following this action will enable Bitstamp to hold USD on your behalf. .row.fund-tab-description .col-xs-7.col-sm-5.col-md-4 - button.btn.btn-large.btn-primary(ng-show="!usdConnected && !usdLoading && loadState.account", type="submit", ng-click="save_usd_account()", ng-disabled="!account.Balance || !can_add_trust", l10n) Add Bitstamp - button.btn.btn-large.btn-primary(ng-show="!usdConnected && usdLoading", type="submit", ng-disabled="usdLoading", l10n) Adding... - button.btn.btn-large.btn-primary(ng-show="showUsdInstructions && usdConnected", type="submit", ng-click="toggle_usd_instructions()", l10n) Hide instructions - button.btn.btn-large.btn-primary(ng-show="usdConnected && !showUsdInstructions", type="submit", ng-click="toggle_usd_instructions()", l10n) Show instructions + button.btn.btn-large.btn-primary(ng-show="!usd2Connected && !usdLoading && loadState.account", type="submit", ng-click="save_usd_account()", ng-disabled="!account.Balance || !can_add_trust", l10n) Add Bitstamp + button.btn.btn-large.btn-primary(ng-show="!usd2Connected && usdLoading", type="submit", ng-disabled="usdLoading", l10n) Adding... + button.btn.btn-large.btn-primary(ng-show="showUsdInstructions && usd2Connected", type="submit", ng-click="toggle_usd_instructions()", l10n) Hide instructions + button.btn.btn-large.btn-primary(ng-show="usd2Connected && !showUsdInstructions", type="submit", ng-click="toggle_usd_instructions()", l10n) Show instructions .connect.col-xs-5.col-sm-7.col-md-8(ng-hide="usdLoading") - .description.fa.fa-times(ng-show="!usdConnected && account.Balance", l10n) Not connected - .description.fa.fa-check(ng-show="usdConnected && account.Balance", l10n) Connected + .description.fa.fa-times(ng-show="!usd2Connected && account.Balance", l10n) Not connected + .description.fa.fa-check(ng-show="usd2Connected && account.Balance", l10n) Connected .description(ng-show="!account.Balance && loadState.account", l10n) Your account has to be activated before you can add a gateway account. .description(ng-show="!loadState.account") img(src="img/button-s.png", class="loader") span(class="loading_text", l10n) Loading... - .row(ng-show="showUsdInstructions && usdConnected") + .row(ng-show="showUsdInstructions && usd2Connected") .instructions.col-md-10 a.dismiss(href="", id="hide", ng-click="toggle_usd_instructions()", l10n) × .title(l10n) NEW CUSTOMERS- SIGN UP AT BITSTAMP