Merge branch 'v1.29-release' into elevate-bch

blockchain · Dec 1, 2017 · 14f7487 · 14f7487
2 parents 8d8b7f6 + 081f89e
commit 14f7487
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 9 deletions.
diff --git a/app/partials/coinify/checkout.pug b/app/partials/coinify/checkout.pug
@@ -71,7 +71,6 @@ bc-tabs(tab="tabs.selectedTab" tab-options="tabs.options" on-select="tabs.select
         div(ng-repeat="trade in pendingTrades() | orderBy:'createdAt':true"
             user-action-required="trade.state === 'awaiting_transfer_in'"
             inspect-trade="trade.isBuy ? buyHandler : sellHandler"
-            disabled="status.disabled"
             namespace="'COINIFY'"
             conversion="100"
             trade="trade")
@@ -86,7 +85,7 @@ bc-tabs(tab="tabs.selectedTab" tab-options="tabs.options" on-select="tabs.select
             span.em-500.pl-25.ph-5-mobile Recurring Order
           .pv-5
             span.em-500(translate="FREQUENCY")
-          .pv-5
+          .pv-5.hidden-xs
             span.em-500(translate="START")
           .pv-5
             span.em-500(translate="END")

diff --git a/app/partials/coinify/coinify-create-account.pug b/app/partials/coinify/coinify-create-account.pug
@@ -6,7 +6,7 @@
         id="createAccountForm"
         name="createAccountForm"
         autocomplete="off"
-        ng-submit="$ctrl.onSubmit({bank: $ctrl.bank, profile: $ctrl.profile})"
+        ng-submit="$ctrl.viewInfo ? $ctrl.switchView() : $ctrl.onSubmit({bank: $ctrl.bank, profile: $ctrl.profile})"
         novalidate)
         div(ng-if="$ctrl.viewInfo")
           .flex-column.flex-center.phm.mv-10.pb-15
@@ -107,6 +107,7 @@
   .flex-1.flex-end
     button.button-muted.mrm(ng-click="$ctrl.close()" translate="CLOSE")
     button.button-primary(
+      type="button"
       ng-show="$ctrl.viewInfo"
       translate="CONTINUE"
       ng-click="$ctrl.switchView()"

diff --git a/app/templates/exchange/checkout.pug b/app/templates/exchange/checkout.pug
@@ -57,7 +57,12 @@ form.bc-form(
               required)
             span.ph-10 {{bitcoin.code}}
         .f-12.mts
-          span(translate="{{ provider + '.' + trading().reason + '.EXPLAIN' }}" translate-values="{max: max.fiat.toFixed(2), min: min.fiat.toFixed(2), curr: fiat.code}" ng-class="{'state-danger-text': checkoutForm.$error.max || trading().isDisabled}" ng-click="!trading().isDisabled && setMax()")
+          span(translate="{{ provider + '.' + trading().reason + '.EXPLAIN' }}"
+               translate-values="{max: max.fiat.toFixed(2), min: min.fiat.toFixed(2), curr: fiat.code}"
+               ng-class="{'state-danger-text': checkoutForm.$error.max || trading().isDisabled}"
+               ng-click="!trading().isDisabled && setMax()"
+               uib-tooltip="{{::'SELL_MIN_TOOLTIP'|translate}}"
+               tooltip-enable="trading().reason === 'not_enough_funds_to_sell'")
           | &nbsp;
           span(ng-repeat="(option, action) in trading().launchOptions")
             a(ng-click="action()" translate="{{ provider + '.' + trading().reason + '.' + option }}")

diff --git a/assets/js/directives/trade.directive.js b/assets/js/directives/trade.directive.js
@@ -15,7 +15,6 @@ function trade (Env, Alerts, MyWallet, $timeout, $interval, coinify, Exchange) {
       inspectTrade: '=',
       conversion: '=',
       namespace: '=',
-      disabled: '=',
       trade: '=',
       usa: '='
     },
@@ -41,9 +40,8 @@ function trade (Env, Alerts, MyWallet, $timeout, $interval, coinify, Exchange) {
 
     scope.cancel = () => {
       if (!scope.canCancel) return;
-      scope.disabled = true;
       let exchange = MyWallet.wallet.external.coinify;
-      coinify.cancelTrade(scope.trade).then(() => Exchange.fetchProfile(exchange)).finally(() => scope.disabled = false);
+      coinify.cancelTrade(scope.trade).then(() => Exchange.fetchProfile(exchange));
     };
 
     scope.updateBTCExpected = () => {

diff --git a/assets/js/services/coinify.service.js b/assets/js/services/coinify.service.js
@@ -147,7 +147,11 @@ function coinify (Env, BrowserHelper, $timeout, $q, $state, $uibModal, $uibModal
     }).then(() => trade.cancel())
       .then(() => Exchange.fetchExchangeData(service.exchange))
       .then(() => checkForSubAndFetch())
-      .catch((e) => { Alerts.displayError('ERROR_TRADE_CANCEL'); });
+      .catch((e) => {
+        if (e !== 'cancelled' && e !== 'escape key press' && e !== 'backdrop click') {
+          Alerts.displayError('ERROR_TRADE_CANCEL');
+        }
+      });
   };
 
   service.getSubscriptions = () => {

diff --git a/locales/en-human.json b/locales/en-human.json
@@ -1202,7 +1202,7 @@
   "SELECT_YOUR_COUNTRY": "Select your country",
   "SELECT_YOUR_STATE": "Select your state",
   "VERIFY_EMAIL": "Verify email:",
-  "SENT_VERIFICATION": "We sent a verification link to <b>{{::email}}</b>. Click it and return here to continue with your purchase.",
+  "SENT_VERIFICATION": "We sent a verification link to <b>{{::email}}</b>. Click it and return here to continue with your transaction.",
   "ACCEPT_TERMS": "Coinify account terms:",
   "PAYMENT_FEE": "Payment Fee:",
   "NEEDS_REFRESH": "Please refresh your wallet to access this feature.",
@@ -2037,5 +2037,6 @@
     "NOW_SUPPORTING": "Now Supporting Bitcoin Cash!",
     "ANNOUNCEMENT": "We're excited to announce that your Blockchain wallet is now offering full support for Bitcoin Cash! You can get started sending, requesting, and exchanging today."
   },
+  "SELL_MIN_TOOLTIP": "This minimum does not include the transaction fee.",
   "": ""
 }