Merge branch 'master' into v1.31-release

blockchain · Jan 19, 2018 · 431d6cf · 431d6cf
2 parents 42e143a + 49e3082
commit 431d6cf
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 4 deletions.
diff --git a/app/templates/exchange/upload.pug b/app/templates/exchange/upload.pug
@@ -20,6 +20,8 @@
         span(translate="{{$ctrl.base + '.UPLOAD.' + $ctrl.idType}}.OPTION2")
         span(translate="{{$ctrl.base + '.UPLOAD.' + $ctrl.idType}}.OPTION3")
         span(translate="{{$ctrl.base + '.UPLOAD.' + $ctrl.idType}}.OPTION4")
+      .flex-column.mbm.f-16.em-600
+        span(translate="{{$ctrl.base + '.UPLOAD.' + $ctrl.idType}}.WARNING")
 
   .width-60
     bc-file-upload(file="$ctrl.file" id-type="$ctrl.idType" base="$ctrl.base" on-upload="$ctrl.onUpload" locked="$ctrl.locked" upload-steps="$ctrl.uploadSteps" on-upload-step="$ctrl.onUploadStep")
diff --git a/assets/js/controllers/sfox/sfoxLink.controller.js b/assets/js/controllers/sfox/sfoxLink.controller.js
@@ -5,6 +5,7 @@ angular
 function SfoxLinkController ($scope, AngularHelper, $q, $sce, $timeout, sfox, modals, Env, $window) {
   let exchange = $scope.vm.exchange;
   let accounts = $scope.vm.accounts;
+  if (sfox.activeAccount) $scope.vm.close(true);
 
   Env.then(env => {
     $scope.plaidUrl = $sce.trustAsResourceUrl(`${env.walletHelperDomain}/wallet-helper/plaid/#/key/${env.partners.sfox.plaid}/env/${ env.partners.sfox.plaidEnv}`);

diff --git a/assets/js/controllers/sfox/sfoxUpload.controller.js b/assets/js/controllers/sfox/sfoxUpload.controller.js
@@ -59,7 +59,7 @@ function SfoxUploadController (AngularHelper, Env, $scope, $q, state, $http, sfo
     if (level === 'pending' && !required_docs[0]) complete = true;
 
     $scope.onUploadStep = initialUploadStep += 1;
-    complete && $scope.vm.goTo('link');
+    complete && $scope.vm.goTo(sfox.determineStep(exchange));
   };
 
   AngularHelper.installLock.call($scope);

diff --git a/assets/js/services/sfox.service.js b/assets/js/services/sfox.service.js
@@ -105,7 +105,7 @@ function sfox ($q, MyWallet, Alerts, modals, Env, Exchange, currency, localStora
     return canTrade && isSFOXCountryState && MyWallet.wallet.hdwallet.defaultAccount.balance > 0;
   }
 
-  function determineStep (exchange, accounts) {
+  function determineStep (exchange) {
     let profile = exchange.profile;
     if (!profile) {
       return 'create';
@@ -125,7 +125,7 @@ function sfox ($q, MyWallet, Alerts, modals, Env, Exchange, currency, localStora
       reason: service.sellReason,
       isDisabled: !service.userCanSell,
       launchOptions: service.sellLaunchOptions,
-      verificationRequired: !service.activeAccount
+      verificationRequired: !service.verified || !service.activeAccount
     };
   }
 

diff --git a/locales/en-human.json b/locales/en-human.json
@@ -1687,6 +1687,7 @@
         "OPTION2": "",
         "OPTION3": "",
         "OPTION4": "",
+        "WARNING": "",
         "HELP": "Make sure the snapshot clearly displays your pancard number."
       },
       "photo": {
@@ -1698,6 +1699,7 @@
         "OPTION2": "",
         "OPTION3": "",
         "OPTION4": "",
+        "WARNING": "",
         "HELP": "Make sure the snapshot clearly displays your face."
       },
       "address": {
@@ -1709,6 +1711,7 @@
         "OPTION2": "- Driving License",
         "OPTION3": "- Passport (page showing address)",
         "OPTION4": "- Utility Bill",
+        "WARNING": "",
         "HELP": "Make sure the snapshot clearly displays your name and address."
       }
     },
@@ -1804,6 +1807,7 @@
         "OPTION2": "- Passport",
         "OPTION3": "- State or government-issued identification card",
         "OPTION4": "",
+        "WARNING": "",
         "UPLOAD_TITLE": "Photo ID",
         "UPLOAD_SELECT": "Select Upload Method",
         "HELP": "Capture the front side of ID, clearly displaying your identification number."
@@ -1815,6 +1819,7 @@
         "OPTION2": "- First page and signature page of your lease",
         "OPTION3": "- First page of your bank statement",
         "OPTION4": "- DMV or voter registration form",
+        "WARNING": "⛔️ Uploading your passport or your driver's license is not sufficient to verify your address. Please upload one of the options above.",
         "UPLOAD_TITLE": "Proof of Address",
         "UPLOAD_SELECT": "Select Upload Method",
         "HELP": "Make sure the snapshot clearly displays your address."

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-blockchain-wallet",
-  "version": "1.31.0",
+  "version": "1.31.1",
   "description": "AngularJS front-end to My-Wallet-V3.",
   "dependencies": {
     "@uirouter/angularjs": "^1.0.3",