From 0f2600cf6f6c681d37f7a623c357623e809554ca Mon Sep 17 00:00:00 2001 From: Philip Welber Date: Wed, 29 Nov 2017 10:30:24 -0500 Subject: [PATCH 1/7] fix(Recurring Buy): hide start column on mobile --- app/partials/coinify/checkout.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/partials/coinify/checkout.pug b/app/partials/coinify/checkout.pug index 9adfccd83c..d1a63858e0 100644 --- a/app/partials/coinify/checkout.pug +++ b/app/partials/coinify/checkout.pug @@ -86,7 +86,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") From 250c74a7b4a2611549c9a45d1834e51576c83487 Mon Sep 17 00:00:00 2001 From: Philip Welber Date: Wed, 29 Nov 2017 11:17:23 -0500 Subject: [PATCH 2/7] fix(Coinify): do not show trade cancel error when dismissing alert --- assets/js/services/coinify.service.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/assets/js/services/coinify.service.js b/assets/js/services/coinify.service.js index a74289411a..4300622d91 100644 --- 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 = () => { From c1c64e0e86ff0ff3f3f6511303f333bd4a0e3014 Mon Sep 17 00:00:00 2001 From: Philip Welber Date: Wed, 29 Nov 2017 13:40:28 -0500 Subject: [PATCH 3/7] copy(Coinify): purchase --> transaction --- locales/en-human.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/en-human.json b/locales/en-human.json index 6a9d2ee983..77fb483739 100644 --- a/locales/en-human.json +++ b/locales/en-human.json @@ -1199,7 +1199,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 {{::email}}. Click it and return here to continue with your purchase.", + "SENT_VERIFICATION": "We sent a verification link to {{::email}}. 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.", From 26c2e6d6f36c5c4135aff2aba14d14385aa75ab4 Mon Sep 17 00:00:00 2001 From: Philip Welber Date: Wed, 29 Nov 2017 13:54:59 -0500 Subject: [PATCH 4/7] fix(Coinify Sell): do not submit form on enter if on wrong step --- app/partials/coinify/coinify-create-account.pug | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/partials/coinify/coinify-create-account.pug b/app/partials/coinify/coinify-create-account.pug index 80dc44a010..46c0a5ae01 100644 --- 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()" From b103822226add1cb7128c98f4bb8bf9bba83e270 Mon Sep 17 00:00:00 2001 From: Philip Welber Date: Wed, 29 Nov 2017 15:14:58 -0500 Subject: [PATCH 5/7] fix(Order History): remove disabled prop on trade directive that blocks ability to cancel trade --- app/partials/coinify/checkout.pug | 1 - assets/js/directives/trade.directive.js | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/app/partials/coinify/checkout.pug b/app/partials/coinify/checkout.pug index d1a63858e0..457be6ea71 100644 --- 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") diff --git a/assets/js/directives/trade.directive.js b/assets/js/directives/trade.directive.js index 60b8665770..708680d576 100644 --- 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 = () => { From 39756e3e5eb7d43259eb1031d0543eeecb738438 Mon Sep 17 00:00:00 2001 From: plondon Date: Wed, 29 Nov 2017 17:59:46 -0500 Subject: [PATCH 6/7] fix(Eth): dont check for access to eth, figure out how to disable this on testnet later --- assets/js/services/wallet.service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/js/services/wallet.service.js b/assets/js/services/wallet.service.js index 015149c6b3..60a6c7e7b2 100644 --- a/assets/js/services/wallet.service.js +++ b/assets/js/services/wallet.service.js @@ -281,7 +281,7 @@ function Wallet ($http, $window, $timeout, $location, $injector, Alerts, MyWalle history.push(wallet.my.wallet.getHistory()); let Ethereum = $injector.get('Ethereum'); - if (Ethereum.eth && Ethereum.userHasAccess) history.push(Ethereum.fetchHistory()); + if (Ethereum.eth) history.push(Ethereum.fetchHistory()); let ShapeShift = $injector.get('ShapeShift'); if (ShapeShift.shapeshift) ShapeShift.checkForCompletedTrades(); From 9154285a29700a2ebd90d5788ac15d0fd1298c08 Mon Sep 17 00:00:00 2001 From: Philip Welber Date: Thu, 30 Nov 2017 09:03:05 -0500 Subject: [PATCH 7/7] fix(Sell): adds tooltip messaging to clarify minimum sell amount --- app/templates/exchange/checkout.pug | 7 ++++++- locales/en-human.json | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/templates/exchange/checkout.pug b/app/templates/exchange/checkout.pug index b18c9bd0cf..483fc66638 100644 --- 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'") |   span(ng-repeat="(option, action) in trading().launchOptions") a(ng-click="action()" translate="{{ provider + '.' + trading().reason + '.' + option }}") diff --git a/locales/en-human.json b/locales/en-human.json index 77fb483739..c1c8b8ffae 100644 --- a/locales/en-human.json +++ b/locales/en-human.json @@ -2027,5 +2027,6 @@ "RECURRING_BUY": "Recurring Buy", "RECURRING_BUY_WHATS_NEW": "You can now create recurring buy orders in your Blockchain Wallet!", "BANK_TRANSFERS_DISABLED": "Bank transfers are disabled while identity verification is pending.
Click here to finish/complete verification", + "SELL_MIN_TOOLTIP": "This minimum does not include the transaction fee.", "": "" }