feat(Recurring Buy): fix next recurring; add icons

blockchain · Apr 10, 2018 · 007a832 · 007a832
1 parent f81a403
commit 007a832
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/app/partials/coinify/checkout.pug b/app/partials/coinify/checkout.pug
@@ -98,7 +98,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.flex-center
+          i.icon-recurring.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

diff --git a/app/templates/exchange/recurring.pug b/app/templates/exchange/recurring.pug
@@ -1,5 +1,6 @@
 .flex-row.flex-between.mbm
-  div
+  .flex
+    i.icon-recurring.mr-5
     span.primary.em-500 This is a Recurring Order
     helper-button(content="RECURRING_HELPER")
   a.em-300.text-danger.underline(ng-show="$ctrl.showRemove" ng-click="$ctrl.onRemove()") Remove Recurring Order
@@ -8,7 +9,7 @@
     span.f-13(translate="RECURRING_REMINDER" translate-values="{time: $ctrl.frequency}")
   .flex-row.phm.pv-5
     span.flex-1.primary.colon(translate="AMOUNT")
-    span.flex-5.ph-5-mobile {{ format($ctrl.trade.fiatAmount, $ctrl.dollars, true) }} (+ {{ $ctrl.paymentFee | format }} {{ $ctrl.dollars.code }} Payment Fee)
+    span.flex-5.ph-5-mobile {{ format($ctrl.trade.fiatAmount, $ctrl.dollars, true) }} (+ {{ paymentFee | format }} {{ $ctrl.dollars.code }} Payment Fee)
   .flex-row.phm.pv-5
     span.flex-1.primary.colon(translate="FREQUENCY")
     span.flex-5.ph-5-mobile(translate="FREQUENCY_INFO" translate-values="{timespan: timespan}")

diff --git a/assets/js/components/exchange/exchange-recurring.component.js b/assets/js/components/exchange/exchange-recurring.component.js
@@ -26,4 +26,5 @@ function ExchangeRecurringController ($scope, currency, recurringTrade) {
 
   $scope.endTime = this.endTime && new Date(this.endTime).toDateString();
   $scope.timespan = recurringTrade.getTimespan($scope.date, frequency);
+  $scope.paymentFee = this.paymentFee || parseFloat((this.trade.sendAmount / 100).toFixed(2)) - this.trade.fiatAmount
 }
diff --git a/assets/js/services/coinify.service.js b/assets/js/services/coinify.service.js
@@ -220,8 +220,8 @@ function coinify (Env, BrowserHelper, $timeout, $q, $state, $uibModal, $uibModal
   };
 
   service.getNextRecurringTrade = () => {
-    if (service.subscriptions.length) {
-      let activeSub = service.subscriptions.filter(s => s.isActive);
+    let activeSub = service.subscriptions.filter(s => s.isActive);
+    if (activeSub.length) {
       let matchingTrades = service.trades.filter(t => t.tradeSubscriptionId === activeSub[0].id);
       let trade = matchingTrades.sort((a, b) => a.createdAt < b.createdAt);
       const fee = (trade[0].sendAmount / 100) - (trade[0].inAmount / 100);