From a676aed70a4f22a36baa85528524e79ef65f1d38 Mon Sep 17 00:00:00 2001 From: Philip Welber Date: Mon, 23 Apr 2018 09:53:05 -0400 Subject: [PATCH 1/4] fix(Recurring Buy): add missing copy strings --- locales/en-human.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/locales/en-human.json b/locales/en-human.json index e604373ea5..0b1d15e909 100644 --- a/locales/en-human.json +++ b/locales/en-human.json @@ -2129,16 +2129,19 @@ "NEEDS_KYC_AND_TRADES": { "HEADER": "Verify Your Identity and Complete 3 Orders", "BODY": "To unlock the recurring buy feature, verify your identity and complete 3 credit card orders.", + "BODY_WITH_ENDTIME": "@:RECURRING_CONFIRM.NEEDS_KYC_AND_TRADES.BODY", "BUTTON": "Proceed To Verify My Identity" }, "NEEDS_KYC": { "HEADER": "Verify Your Identity", "BODY": "To set up a recurring order, you first need to verify your identity", + "BODY_WITH_ENDTIME": "@:RECURRING_CONFIRM.NEEDS_KYC.BODY", "BUTTON": "Proceed To Verify My Identity" }, "NEEDS_TRADES": { "HEADER": "Complete 3 Orders", "BODY": "To set up Recurring Orders you first need to complete 3 credit card orders with the same card.", + "BODY_WITH_ENDTIME": "@:RECURRING_CONFIRM.NEEDS_TRADES.BODY", "BUTTON": "Close" }, "PROCEED": { From e2b27e268a7bcb0a7d78d9d0720a4107254689f2 Mon Sep 17 00:00:00 2001 From: Philip Welber Date: Mon, 23 Apr 2018 10:42:35 -0400 Subject: [PATCH 2/4] fix(Recurring Buy): add terms to recurring confirm modal --- app/partials/coinify/recurring-confirm.pug | 10 ++++++++-- locales/en-human.json | 3 ++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/partials/coinify/recurring-confirm.pug b/app/partials/coinify/recurring-confirm.pug index 45a9abc6a7..17bc8518c0 100644 --- a/app/partials/coinify/recurring-confirm.pug +++ b/app/partials/coinify/recurring-confirm.pug @@ -2,11 +2,17 @@ .flex-column .f-18.mb-15.em-400 span.f-18.mb-15.em-400(translate="{{ 'RECURRING_CONFIRM' + '.' + $ctrl.state + '.' + 'HEADER' }}") - .f-14.em-300 + div(ng-if="$ctrl.state === 'PROCEED'") + span.f-14.em-300(translate="RECURRING_CONFIRM.TERMS") + .f-14.em-300(ng-if="$ctrl.state !== 'PROCEED'") span.f-14.em-300(ng-if="!$ctrl.endTime" translate="{{ 'RECURRING_CONFIRM' + '.' + $ctrl.state + '.' + 'BODY' }}" translate-values="{timing: $ctrl.recurringTiming()}") span.f-14.em-300(ng-if="$ctrl.endTime" translate="{{ 'RECURRING_CONFIRM' + '.' + $ctrl.state + '.' + 'BODY_WITH_ENDTIME' }}" translate-values="{timing: $ctrl.recurringTiming(), end: $ctrl.endTime.toDateString()}") + .flex-row.flex-align-start.mt-20(ng-if="$ctrl.state === 'PROCEED'") + div + input(type="checkbox" id="$ctrl.recurringCheck" name="$ctrl.recurringCheck" ng-model="$ctrl.recurringCheck") + label.pl-5.em-400(translate="ACCEPT_PARTNER_TOS_PRIVACY" for="$ctrl.recurringCheck") .modal-footer.flex-end.flex-row .flex-1.flex-end button.button-muted.mrm(ng-if="$ctrl.state !== 'NEEDS_TRADES'" ng-click="$ctrl.onCancel()" translate="GO_BACK") - button.button-primary(ng-if="$ctrl.state !== 'NEEDS_TRADES'" translate="{{ 'RECURRING_CONFIRM' + '.' + $ctrl.state + '.' + 'BUTTON' }}" ng-click="$ctrl.onProceed()") + button.button-primary(ng-if="$ctrl.state !== 'NEEDS_TRADES'" translate="{{ 'RECURRING_CONFIRM' + '.' + $ctrl.state + '.' + 'BUTTON' }}" ng-disabled="$ctrl.state === 'PROCEED' ? !$ctrl.recurringCheck : false" ng-click="$ctrl.onProceed()") button.button-primary(ng-if="$ctrl.state === 'NEEDS_TRADES'" translate="{{ 'RECURRING_CONFIRM' + '.' + $ctrl.state + '.' + 'BUTTON' }}" ng-click="$ctrl.onCancel()") diff --git a/locales/en-human.json b/locales/en-human.json index 0b1d15e909..ce4f0f318d 100644 --- a/locales/en-human.json +++ b/locales/en-human.json @@ -2149,7 +2149,8 @@ "BODY": "This Recurring Order will happen today and every {{::timing}} until you cancel or reach your limit, whichever happens first.", "BODY_WITH_ENDTIME": "This Recurring Order will happen today and every {{::timing}} until {{::end}} or you reach your limit, whichever happens first.", "BUTTON": "Proceed with my Order" - } + }, + "TERMS": "By scheduling this Recurring Order, you agree to and accept that your card will be charged each time a new order is due to be processed according to the amount, currency, and frequency settings chosen." }, "RECURRING_NEXT_SCHEDULED": "Your Next Recurring Order is Scheduled", "RECURRING_NEXT_TRADE": "This order will happen every {{::timespan}}", From 136ee5dbfd0d9cb91672897b8f71f425a8932a49 Mon Sep 17 00:00:00 2001 From: Philip Welber Date: Mon, 23 Apr 2018 10:49:34 -0400 Subject: [PATCH 3/4] fix(Linter): remove unused var --- assets/js/controllers/wallet.controller.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/assets/js/controllers/wallet.controller.js b/assets/js/controllers/wallet.controller.js index d18e19f791..492787d843 100644 --- a/assets/js/controllers/wallet.controller.js +++ b/assets/js/controllers/wallet.controller.js @@ -94,8 +94,6 @@ function WalletCtrl ($scope, $rootScope, Wallet, $uibModal, $timeout, Alerts, $i ); $scope.$on('$stateChangeStart', (event, toState, toParams, fromState, fromParams) => { - let wallet = MyWallet.wallet; - let featureDisabledWhen = (disabled, reason) => { if (disabled) { Alerts.featureDisabled(reason); From 7191934571542a48c3fd7f3ec07c93e218521e3c Mon Sep 17 00:00:00 2001 From: Philip Welber Date: Mon, 23 Apr 2018 10:54:15 -0400 Subject: [PATCH 4/4] fix(Recurring Buy): accept coinify terms --- app/partials/coinify/recurring-confirm.pug | 2 +- locales/en-human.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/partials/coinify/recurring-confirm.pug b/app/partials/coinify/recurring-confirm.pug index 17bc8518c0..46b2dd1f7a 100644 --- a/app/partials/coinify/recurring-confirm.pug +++ b/app/partials/coinify/recurring-confirm.pug @@ -10,7 +10,7 @@ .flex-row.flex-align-start.mt-20(ng-if="$ctrl.state === 'PROCEED'") div input(type="checkbox" id="$ctrl.recurringCheck" name="$ctrl.recurringCheck" ng-model="$ctrl.recurringCheck") - label.pl-5.em-400(translate="ACCEPT_PARTNER_TOS_PRIVACY" for="$ctrl.recurringCheck") + label.pl-5.em-400(translate="ACCEPT_COINIFY_TOS" for="$ctrl.recurringCheck") .modal-footer.flex-end.flex-row .flex-1.flex-end button.button-muted.mrm(ng-if="$ctrl.state !== 'NEEDS_TRADES'" ng-click="$ctrl.onCancel()" translate="GO_BACK") diff --git a/locales/en-human.json b/locales/en-human.json index ce4f0f318d..6c77392cc1 100644 --- a/locales/en-human.json +++ b/locales/en-human.json @@ -1029,6 +1029,7 @@ "CHANGE_EMAIL": "Want to change your email address? Click here.", "PARTNER": "Email Verified! Our partner Coinify will process your bitcoin transaction. By clicking 'Continue' you will create an account with Coinify. Your account will be associated with your verified email address {{::email}}.", "ACCEPT_PARTNER_TOS_PRIVACY": "Accept our Terms of Service, Coinify's Terms of Service and Privacy Policy", + "ACCEPT_COINIFY_TOS": "Accept Coinify's Terms of Service and Privacy Policy", "EMAIL_IN_USE": "{{::email}} is already in use. ", "CLICK_TO_CHANGE": "Click here to change it.", "METHOD": "Method",