Merge pull request #1483 from blockchain/sfox-launch

Sfox launch
blockchain · Mar 27, 2018 · 722dc51 · 722dc51
2 parents bad91d5 + ea3b76d
commit 722dc51
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/app/partials/sfox/checkout.pug b/app/partials/sfox/checkout.pug
@@ -63,7 +63,7 @@ bc-tabs(tab="tabs.selectedTab" tab-options="tabs.options" on-select="tabs.select
           i.pointer.ti-close.f-14.mid-grey(ng-click="checkout.dismissSellIntro()")
       p.f-12.mt-10(translate="SFOX.sell.INTRODUCING_BODY")
   .flex-row.pbvl(ng-if="checkout.onStep('confirm')")
-    exchange-confirm.width-50.border-desktop(
+    exchange-confirm.width-55.border-desktop(
       type="checkout.type"
       quote="checkout.quote"
       namespace="'SFOX'"

diff --git a/app/templates/exchange/confirm.pug b/app/templates/exchange/confirm.pug
@@ -25,9 +25,11 @@ form.bc-form.pv-20(
             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'}}")  
           span {{ field.val }}
-      .flex-row.flex-center
-        input(type="checkbox" id="terms" name="terms" ng-model="terms" required)
-        label.mbn.f-13.em-300(for="terms" translate=".ACCEPT_TERMS")
+      .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}")
       .flex-row.flex-end
         button.button-muted(type="button" translate="CANCEL" ng-click="$ctrl.onCancel()")
         button.button-primary.ml-20(

diff --git a/assets/css/modules/_buy-sell.scss b/assets/css/modules/_buy-sell.scss
@@ -478,3 +478,5 @@ input[type="radio"]:checked + label {
     background-color: white !important;
   }
 }
+
+.f-11 { font-size: 11px; }
diff --git a/locales/en-human.json b/locales/en-human.json
@@ -1927,7 +1927,8 @@
       "confirm": {
         "HEADER": "Confirm Buy Order",
         "BODY": "@:SFOX.sell.confirm.BODY",
-        "ACCEPT_TERMS": "@:SFOX.sell.confirm.ACCEPT_TERMS"
+        "ACCEPT_TERMS": "@:SFOX.sell.confirm.ACCEPT_TERMS",
+        "ACCEPT_TERMS_EXTENDED": "I authorize SFOX, Inc. to debit my linked bank account ending in {{::account}} via ACH and acknowledge that all transactions to/from my bank account comply with the SFOX <a href='https://www.sfox.com/terms.html' target='_blank' rel='noopener noreferrer'>Terms of Service</a>, and are in accordance with US law and standard banking (including ACH) guidelines"
       },
       "processing": {
         "DISPLAY": "Pending Buy",