Merge pull request #737 from blockchain/coinify-quick-start

Coinify quick start
blockchain · Oct 27, 2016 · c0bcd4f · c0bcd4f
2 parents 3981275 + 140bf25
commit c0bcd4f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/app/templates/buy-quick-start.jade b/app/templates/buy-quick-start.jade
@@ -30,7 +30,7 @@
             ul.uib-dropdown-menu.dropdown-menu.currency-dropdown(role="menu")
               li(ng-repeat="currency in currencies"
                  role="menuitem" 
-                 ng-click="changeCurrency({currency: currency});"
+                 ng-click="transaction.btc = null; changeCurrency({currency: currency}); getQuote();"
                  ng-class="{active: isCurrencySelected(currency)}")
                 a(ng-click="$event.preventDefault()") {{ currency.code }}
         i.ti-arrows-horizontal.mhm.type-h4
@@ -41,7 +41,7 @@
             name="btc"
             step="any"
             tabindex="1"
-            ng-change="transaction.fiat = null; getQuote(transaction.btc);"
+            ng-change="transaction.fiat = null; getQuote();"
             ng-model-options="{debounce: 250}"
             placeholder="{{placeholder}}")
           div.input-group-btn

diff --git a/assets/js/directives/buy-quick-start.directive.js b/assets/js/directives/buy-quick-start.directive.js
@@ -50,14 +50,17 @@ function buyQuickStart (currency, buySell, Alerts, $interval) {
       startFetchingQuote();
       scope.getExchangeRate();
       scope.status.waiting = true;
-      scope.transaction.fiat && buySell.getQuote(scope.transaction.fiat, scope.transaction.currency.code).then(success, error);
-      scope.transaction.btc && buySell.getQuote(-scope.transaction.btc, 'BTC', scope.transaction.currency.code).then(success, error);
+      scope.transaction.btc
+        ? buySell.getQuote(-scope.transaction.btc, 'BTC', scope.transaction.currency.code).then(success, error)
+        : buySell.getQuote(scope.transaction.fiat, scope.transaction.currency.code).then(success, error);
     };
 
     const success = (quote) => {
-      scope.transaction.fiat
-        ? scope.transaction.btc = quote.quoteAmount / 100000000
-        : scope.transaction.fiat = -quote.quoteAmount / 100;
+      if (quote.baseCurrency === 'BTC') {
+        scope.transaction.fiat = -quote.quoteAmount / 100;
+      } else {
+        scope.transaction.btc = quote.quoteAmount / 100000000;
+      }
       scope.quote = quote;
       scope.status = {};
       Alerts.clear();

diff --git a/locales/en-human.json b/locales/en-human.json
@@ -1112,5 +1112,6 @@
   "SHOW": "Show",
   "HIDE": "Hide",
   "EDIT_NAME": "Edit Name",
-  "NOT_BACKED_BY_RECOVERY": "Not backed up by your Recovery Phrase. Transfer into a wallet to secure funds."
+  "NOT_BACKED_BY_RECOVERY": "Not backed up by your Recovery Phrase. Transfer into a wallet to secure funds.",
+  "EXCHANGE_RATE_HELPER": "The rate offered by your region's exchange partner. May include fees."
 }