Merge branch 'v1.35-release' into com-migration

app/partials/coinify-modal.pug

@@ -1,4 +1,5 @@
-#buy(ng-class="{rendered:rendered}" data-preflight-tag="BuyModal")
+coinify-recurring-confirm(ng-if="vm.onStep('confirm-recurring')" end-time="vm.endTime" frequency="vm.frequency" on-proceed="vm.needsKYCForRecurring ? vm.triggerKYCForRecurring() : vm.goTo('select-payment-medium')" on-cancel="vm.cancel()" exchange="vm.exchange" needs-kyc="vm.needsKYCForRecurring")
+#buy(ng-if="!vm.onStep('confirm-recurring')" ng-class="{rendered:rendered}" data-preflight-tag="BuyModal")
   .modal-header.bc-modal-header.flex-between.flex-center(ng-class="{'no-border': isPendingBankTransfer()}")
     .flex-1(ng-class="inMobileBuy ? 'flex-row-reverse flex-center flex-between' : 'flex-column'")
       .flex-row.flex-between.flex-center

app/partials/coinify/checkout.pug

@@ -20,9 +20,25 @@ bc-tabs(tab="tabs.selectedTab" tab-options="tabs.options" on-select="tabs.select
         frequencies="frequencyOptions"
         on-success="buyHandler(quote, null, frequency, endTime)"
         recurring-buy-limit="recurringBuyLimit()"
+        show-recurring="showRecurringBuy"
+        disable-recurring="disableRecurring"
         handle-quote="buyQuoteHandler(amount, baseCurr, quoteCurr)")
     .flex-column.ml-60.col-md-5.col-sm-12.col-xs-12.pln.prn.pv-10-mobile.no-margin-mobile.hidden-xs
-      .mb-20(ng-show="showRecurringBuy && !hasDismissedRecurringBuyIntro()")
+      .mb-20.flex-column.pv-20.ph-20.bg-footer-blue(ng-show="nextRecurring().frequency && nextRecurring().amount")
+        .flex-center
+          i.flex-center.icon-recurring.f-16.mr-5
+          span.f-13(translate="RECURRING_NEXT_SCHEDULED")
+        .flex-row.pt-10
+          span.f-13 Amount: 
+          span.f-13 {{ nextRecurring().amount }}
+          | 
+          span.em-200.f-13 {{ nextRecurring().currency }} (+ {{ nextRecurring().fee }} {{ nextRecurring().currency }} Payment Fee)
+        .flex-row.pt-10
+          span.f-13 Frequency: 
+          span.f-13.em-200(translate="RECURRING_NEXT_TRADE" translate-values="{timespan: nextRecurringTimespan()}")
+        .flex-row.pt-20.flex-end
+          a(translate="MANAGE_THIS_ORDER" ng-click="tabs.select('ORDER_HISTORY')")
+      .mb-20(ng-show="showRecurringBuy && !hasDismissedRecurringBuyIntro() && !disableRecurring")
         .flex-between
           span.f-24.blue.f-14-mobile
             i.icon-buy-sell.h3.mrm
@@ -31,7 +47,13 @@ bc-tabs(tab="tabs.selectedTab" tab-options="tabs.options" on-select="tabs.select
             i.pointer.ti-close.f-14.mid-grey(ng-click="dismissRecurringBuyIntro()")
         p.f-12.mt-10(translate="RECURRING_INTRO_1")
         p.f-12(translate="RECURRING_INTRO_2")
-        p.f-12(translate="RECURRING_INTRO_3")
+        div.mb-10
+          span.f-12(translate="RECURRING_INTRO_3")
+          |  
+          a.f-12(translate="ORDERS" ng-click="tabs.select('ORDER_HISTORY')")
+        span.f-12(translate="RECURRING_INTRO_4")
+        |  
+        a.f-12(translate="LEARN_MORE_HERE" ng-click="goToFaq()")
       kyc-status(ng-if="pendingKYC()" kyc="pendingKYC()" on-trigger="openKYC()" currency="buyFiat.code")
   .flex-row.flex-column-tablet.flex-column-mobile(ng-show="tabs.selectedTab === 'SELL_BITCOIN'")
     //- SELL
@@ -78,7 +100,9 @@ bc-tabs(tab="tabs.selectedTab" tab-options="tabs.options" on-select="tabs.select
             trade="trade")
     div(ng-show="recurringTrades().length")
       .flex-row.flex-between.flex-center.mtl
-        h4.type-h5 Recurring Orders
+        .flex-row
+          i.flex-center.icon-recurring.f-16.mr-5
+          h4.type-h5 Recurring Orders
         div(ng-hide="pendingTrades().length")
           span.hidden-xs(ng-show="exchange.profile.email") Coinify Account: {{ exchange.profile.email }}
       .width-100

app/partials/coinify/recurring-confirm.pug

@@ -0,0 +1,18 @@
+.pv-25.ph-25
+  .flex-column
+    .f-18.mb-15.em-400
+      span.f-18.mb-15.em-400(translate="{{ 'RECURRING_CONFIRM' + '.' + $ctrl.state + '.' + 'HEADER' }}")
+    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_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")
+    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()")

app/partials/coinify/summary.pug

@@ -56,7 +56,7 @@ form.bc-form.modal-body.fade.clearfix(id="summaryForm" name="summaryForm" role="
       div
         label.mlm.em-300(translate="ACCEPT_COINIFY_RATE" for="rate")
     .mtl
-      exchange-recurring(ng-if="vm.frequency" frequency="vm.frequency" end-time="vm.endTime" t="trade" dollars="dollars" show-remove="state.editAmount" on-remove="vm.cancelSubscription()")
+      exchange-recurring(ng-if="vm.frequency" frequency="vm.frequency" end-time="vm.endTime" t="trade" dollars="dollars" show-remove="state.editAmount" on-remove="vm.cancelSubscription()" payment-fee="trade.fee")
     .flex-row.flex-between.pt-20
       button.button-muted(type="button" ng-hide="inMobileBuy" ng-click="vm.goTo('select-payment-medium')" translate="GO_BACK")
       button.button-primary(type="submit" form="summaryForm" ng-disabled="summaryForm.$invalid || locked" translate="{{state.editAmount ? 'UPDATE' : 'CONFIRM'}}")

app/partials/login.pug

@@ -18,7 +18,7 @@
         .item
           label(translate="UID" for="UID_input")
           div
-            input#UID_input.form-control(type="text" ng-model="uid" name="UID_input" focus-when="!uidAvailable" ng-change="errors.uid = null" required)
+            input#UID_input.form-control(type="text" ng-model="uid" name="UID_input" focus-when="!uidAvailable" ng-change="errors.uid = null" ng-disabled="underMaintenance" required)
             .help-block.mbn.alt-font.f-14(ng-show="errors.uid" ui-sref="public.reminder")
               span(translate="{{ errors.uid }}")
             .help-block.mbn.alt-font.f-14.hidden-xs
@@ -27,7 +27,7 @@
         .item
           label(translate="PASSWORD" for="pass_input")
           div
-            input#pass_input.form-control(type="password" name="pass_input" ng-model="password" focus-when="uidAvailable" required)
+            input#pass_input.form-control(type="password" name="pass_input" ng-model="password" focus-when="uidAvailable" ng-disabled="underMaintenance" required)
             .help-block.mbn.alt-font.f-14
               span(translate="{{ errors.password }}")
       .group.mb-15(ng-show="settings.needs2FA" ng-class="{'has-error': errors.twoFactor || settings.twoFactorMethod == 3}")
@@ -50,7 +50,7 @@
           type="submit"
           ui-ladda="status.busy"
           ladda-translate="LOG_IN"
-          ng-disabled="loginForm.$invalid")
+          ng-disabled="loginForm.$invalid || underMaintenance")
   .ptl.flex-between
     div
       a(ng-show="showMobileLogin" ui-sref="public.mobile-login" translate="MOBILE_LOGIN.TITLE")

app/partials/public.pug

@@ -3,6 +3,7 @@
   .banners-container
     testnet-warning
     block-alert.public-block-alert-overrides(ng-if="showPublicBanner" config="publicBannerConfig")
+    maintenance-warning
   .overflow-scroll.flex-justify.flex-center
     .flex-center.flex-justify.flex-column
       .flex.flex-justify

app/partials/sfox/checkout.pug

@@ -31,7 +31,7 @@ bc-tabs(tab="tabs.selectedTab" tab-options="tabs.options" on-select="tabs.select
         trade-account="checkout.state.account"
         handle-quote="buyQuoteHandler(amount, baseCurr, quoteCurr)"
         on-success="buying().verificationRequired ? checkout.openSfoxSignup() : prepareBuy(quote)")
-    .flex-column.width-50.pl-30.prn.pv-10-mobile.no-margin-mobile.hidden-xs(ng-if="checkout.onStep('create') && showBuy() && !checkout.hasDismissedBuyIntro()")
+    .flex-column.width-50.pl-30.prn.pv-10-mobile.no-margin-mobile.hidden-xs(ng-if="checkout.onStep('create') && showBuy() && !checkout.hasDismissedBuyIntro() && !pendingBuyTrades().length")
       .mb-20
         .flex-between
           span.f-24.blue.f-14-mobile
@@ -40,6 +40,10 @@ bc-tabs(tab="tabs.selectedTab" tab-options="tabs.options" on-select="tabs.select
           span
             i.pointer.ti-close.f-14.mid-grey(ng-click="checkout.dismissBuyIntro()")
         p.f-12.mt-10(translate="SFOX.buy.INTRODUCING_BODY")
+    .width-50.pl-30.prn.pv-10-mobile.no-margin-mobile(ng-if="pendingBuyTrades().length")
+      span You have {{ pendingBuyTrades().length }} pending buy {{ pendingBuyTrades().length === 1 ? 'transaction' : 'transactions' }} for a total of {{ pendingBuyTradesTotal() }} BTC. You can see more details in your
+      |  
+      a(ng-click="tabs.select('ORDER_HISTORY')") Order History.
   .flex-row.pbvl(ng-show="tabs.selectedTab === 'SELL_BITCOIN' && checkout.onStep('create')")
     .border-desktop.ph-30.pv-30.width-50.no-padding-mobile(ng-controller="SfoxSellCheckoutController")
       exchange-checkout(
@@ -54,14 +58,18 @@ bc-tabs(tab="tabs.selectedTab" tab-options="tabs.options" on-select="tabs.select
         trade-account="checkout.state.account"
         handle-quote="sellQuoteHandler(amount, baseCurr, quoteCurr)"
         on-success="selling().verificationRequired ? checkout.openSfoxSignup() : buildPayment(quote)")
-    .flex-column.width-50.pl-30.prn.pv-10-mobile.no-margin-mobile.hidden-xs(ng-if="checkout.onStep('create') && !checkout.hasDismissedSellIntro()")
+    .flex-column.width-50.pl-30.prn.pv-10-mobile.no-margin-mobile.hidden-xs(ng-if="checkout.onStep('create') && !checkout.hasDismissedSellIntro() && !pendingSellTrades().length")
       .flex-between
         span.f-24.blue.f-14-mobile
           i.icon-buy-sell.h3.mrm
           span(translate="SFOX.sell.INTRODUCING_HEADER")
         span
           i.pointer.ti-close.f-14.mid-grey(ng-click="checkout.dismissSellIntro()")
       p.f-12.mt-10(translate="SFOX.sell.INTRODUCING_BODY")
+    .width-50.pl-30.prn.pv-10-mobile.no-margin-mobile(ng-if="pendingSellTrades().length")
+      span You have {{ pendingSellTrades().length }} pending sell {{ pendingSellTrades().length === 1 ? 'transaction' : 'transactions' }} for a total of {{ pendingSellTradesTotal() }} USD. You can see more details in your
+      |  
+      a(ng-click="tabs.select('ORDER_HISTORY')") Order History.
   .flex-row.pbvl(ng-if="checkout.onStep('confirm')")
     exchange-confirm.width-55.border-desktop(
       type="checkout.type"

app/partials/sfox/details.pug

@@ -3,7 +3,7 @@ div(ng-controller="SfoxTradeDetailsController")
     span.f-16.em-500.pl-30.no-padding-mobile(translate="{{namespace + type + state + '.HEADER'}}" class="{{classHelper(trade)}}")
   .ph-30.pt-20.ph-10-mobile.pv-20-mobile
     .f-13.mb-10
-      span(translate="{{namespace + type + state + '.BODY'}}" translate-values="{tradeId: tradeId}")
+      span(translate="{{namespace + type + state + '.BODY'}}" translate-values="{tradeId: tradeId, expectedDelivery: tradeDetails.expectedDelivery.val}")
     div(ng-if="tradeAccount")
       .flex-end.flex-row.mb-5.mt-5
         span.mid-grey.f-12 1 BTC = {{ rate }}

app/partials/signup.pug

@@ -27,7 +27,8 @@ form.bc-form.form-horizontal.mt-30(
             type="email"
             ng-model="fields.email"
             required
-            focus-when="!fields.email.length")
+            focus-when="!fields.email.length"
+            ng-disabled="underMaintenance")
           span.error(ng-show="signupForm.email.$touched")
             span(ng-show="signupForm.email.$error.required" translate="EMAIL_ADDRESS_REQUIRED")
             span(ng-show="signupForm.email.$error.email" translate="EMAIL_ADDRESS_INVALID")
@@ -43,6 +44,7 @@ form.bc-form.form-horizontal.mt-30(
             min-entropy="25"
             focus-when="fields.emailIsFromState"
             ng-change="fields.confirmation = ''"
+            ng-disabled="underMaintenance"
             required)
           span.error(ng-show="signupForm.password.$touched")
             span(ng-show="signupForm.password.$error.minEntropy && fields.password != undefined" translate="TOO_WEAK")
@@ -57,6 +59,7 @@ form.bc-form.form-horizontal.mt-30(
             type="password"
             ng-model="fields.confirmation"
             is-valid="fields.confirmation == fields.password"
+            ng-disabled="underMaintenance"
             required)
           span.error(ng-show="signupForm.confirmation.$touched")
             span(ng-show="signupForm.confirmation.$error.isValid" translate="NO_MATCH")
@@ -71,6 +74,6 @@ form.bc-form.form-horizontal.mt-30(
     .group.mb-15.full
       button.button-primary.button-heavy(
         type="submit"
-        ng-disabled="signupForm.$invalid || !currency_guess"
+        ng-disabled="signupForm.$invalid || !currency_guess || underMaintenance"
         ladda-translate="CONTINUE"
         ui-ladda="working")

app/partials/trade-summary.pug

@@ -7,14 +7,14 @@
       label.em-500.flex-start.mb-15(ng-hide="isPendingBankTransfer && isPendingBankTransfer()" translate="{{isKYC || needsKyc() ? 'DETAILS' : 'ORDER_DETAILS'}}")
       ul.em-300.bg-grey.border-top.pan.mb-15(ng-class="{'bank-transfer': isPendingBankTransfer && isPendingBankTransfer()}")
         li.pam.border-right.border-left.border-bottom-light.flex-between(ng-repeat="(prop, val) in formattedTrade.tx track by $index" ng-if="val")
-          span.em-300.colon(translate="{{prop}}" ng-class="{'em-500': prop === 'TOTAL_COST'}")
+          span.em-300(translate="{{prop}}" ng-class="{'em-500': prop === 'TOTAL_COST'}")
           span.em-300.right-align.capitalize(ng-bind="val" ng-class="{'em-500': prop === 'TOTAL_COST', 'capitalize' : prop !== 'RECEIVING_ADDRESS'}")
           span.security-red.plm(ng-if="$last && isPendingBankTransfer()" translate="ORDER_ID_REFERENCE")
   p.security-red.pointer.ng-hide(ng-show="vm.qaDebugger && vm.trade.bankAccount && vm.trade.state === 'awaiting_transfer_in'")
     i.ti-search.mrm
     span(ng-click="fakeBankTransfer()" translate="QA: Click here to fake a bank transfer")
   .mtm
-    exchange-recurring(ng-if="vm.frequency" frequency="vm.frequency" end-time="vm.endTime" t="trade" dollars="dollars")
+    exchange-recurring(ng-if="vm.frequency && trade.sendAmount" frequency="vm.frequency" end-time="vm.endTime" t="trade" dollars="dollars" on-close="$close()")
   .flex-row.flex-between.pt-20
     .flex-start.flex-center
       a(ng-show="tradeIsPending()" ng-click="editRef()" ng-class="{ 'link-disabled mid-grey': disableLink }" translate="EDIT_REF")

app/templates/exchange/checkout.pug

@@ -86,9 +86,8 @@ form.bc-form(
           a(href='mailto:support@sfox.com').f-12 support@sfox.com
     .group.inline.mt-10(ng-if="$ctrl.frequencies && !trading().isDisabled && $ctrl.showRecurringBuy")
       .item.inline.check
-        input(type="checkbox" id="frequencyCheck" name="frequencyCheck" ng-model="state.frequencyCheck" ng-disabled="checkoutForm.fiat.$viewValue > $ctrl.recurringBuyLimit() || $ctrl.recurringBuyLimit() < min.fiat")
-        label(for="frequencyCheck") Make this a recurring order
-        helper-button(content="{{ provider + '.recurring_buy' + ($ctrl.recurringBuyLimit() < min.fiat ? '.disabled' : '.enabled') | translate:{cardLimit: $ctrl.recurringBuyLimit(), currency: fiat.code } }}" append="true")
+        input(type="checkbox" id="frequencyCheck" name="frequencyCheck" ng-model="state.frequencyCheck" ng-disabled="checkoutForm.fiat.$viewValue > $ctrl.recurringBuyLimit() || $ctrl.recurringBuyLimit() < min.fiat || $ctrl.disableRecurring")
+        label(for="frequencyCheck" translate="MAKE_RECURRING_ORDER" uib-tooltip="{{'RECURRING_DISABLED_TOOLTIP'|translate}}" tooltip-enable="$ctrl.disableRecurring" tooltip-placement="top")
     .group.mt-10.recurring-buy(ng-if="state.frequencyCheck && !trading().isDisabled && checkoutForm.fiat.$viewValue <= $ctrl.recurringBuyLimit()")
       .group
         span.colon.f-13.em-500(translate="FREQUENCY")

app/templates/exchange/confirm.pug

@@ -23,13 +23,14 @@ form.bc-form.pv-20(
           div
             span(translate="{{namespace + type + field.key}}") {{field.key}}
             helper-button(ng-show="field.key === '.TX_FEE'" content="{{namespace + type + '.TRANSACTION_FEE_HELPER'}}")
-            helper-button(ng-show="field.key === '.TRADING_FEE'" content="{{namespace + '.TRADING_FEE_HELPER'}}")  
+            helper-button(ng-show="field.key === '.TRADING_FEE'" content="{{namespace + '.TRADING_FEE_HELPER'}}")
           span {{ field.val }}
       .flex-row.flex-align-start
         .pts
           input(type="checkbox" id="terms" name="terms" ng-model="terms" required)
         label.mbn.f-13.em-300(ng-if="!$ctrl.tradeAccount" for="terms" translate=".ACCEPT_TERMS")
-        label.mt-15.mb-20.ml-5.f-11.em-300(ng-if="$ctrl.tradeAccount" for="terms" translate=".ACCEPT_TERMS_EXTENDED" translate-values="{account: $ctrl.tradeAccount.accountNumber}")
+        label.mt-15.mb-20.ml-5.f-11.em-300(ng-if="$ctrl.tradeAccount && type === '.buy'" for="terms" translate=".ACCEPT_TERMS_EXTENDED" translate-values="{account: $ctrl.tradeAccount.accountNumber}")
+        label.mt-15.mb-20.ml-5.f-11.em-300(ng-if="$ctrl.tradeAccount && type === '.sell'" for="terms" translate=".ACCEPT_TERMS_EXTENDED" translate-values="{account: $ctrl.tradeAccount.accountNumber}")
       .flex-row.flex-end
         button.button-muted(type="button" translate="CANCEL" ng-click="$ctrl.onCancel()")
         button.button-primary.ml-20(

app/templates/exchange/recurring-trades.pug

@@ -3,6 +3,7 @@
     span.pl-25.ph-10-mobile.flex-row.flex-center.pointer(ng-click="state.toggled = !state.toggled")
       i.icon-down_arrow.f-8.mr-5(ng-class="{rotated: !state.toggled}")
       span(class="{{$ctrl.subscription.isActive ? 'transfer' : 'state-danger-text'}}") {{ $ctrl.subscription.isActive ? 'Active' : 'Inactive' }}
+    a.em-400(translate="MANAGE_THIS_ORDER" ng-click="state.toggled = !state.toggled" ng-class="{'opacity-5': state.toggled}")
   .exchange-date.pv-15
     span.capitalize {{ $ctrl.subscription.frequency }}
   .exchange-exchanged.pv-15
@@ -36,5 +37,5 @@
         span {{ trade.sendAmount / 100 }} {{ trade.inCurrency }}
         span(ng-if="canCancel(trade)")
           i.ti-trash.mls.pointer.state-danger-text(ng-click="cancelTrade(trade); $event.stopPropagation();" ng-show="canCancel" uib-tooltip="{{'CLICK_TO_CANCEL' | translate}}")
-    .width-100.flex-end(ng-show="state.toggled")
-      .span.pv-15.state-danger-text.pointer(ng-show="$ctrl.subscription.isActive" ng-click="cancel()") Cancel Recurring Order
+    .width-100.flex-end.mv-20(ng-show="state.toggled")
+      .button-danger.f-13(ng-show="$ctrl.subscription.isActive" ng-click="cancel()" translate="CANCEL_RECURRING_ORDER")