Merge pull request #518 from blockchain/welcome-modal

Show welcome modal
blockchain · Jul 20, 2016 · 35b31c2 · 35b31c2
2 parents 0baf88e + b4a4848
commit 35b31c2
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 52 deletions.
diff --git a/app/partials/first-login-modal.jade b/app/partials/first-login-modal.jade
@@ -6,9 +6,11 @@
       p.mbl.type-h4.em-300(translate="THANK_YOU_FOR_JOINING")
       p.mbl.type-h5.width-100.em-300
         span(translate="FIRST_LOGIN_TEXT_1")
+        | &nbsp;
         a.security-red(ui-sref="wallet.common.security-center")
           i.bc-icon-security
-          | 
+          | &nbsp;
           span(translate="SECURITY_CENTER")
+          | &nbsp;
         span(translate="FIRST_LOGIN_TEXT_2")
-    button.button-success.mtl(ng-click="ok()", translate="FIRST_LOGIN_ACTION")
+    button.button-success.mtl(ng-click="$close()" translate="FIRST_LOGIN_ACTION")
diff --git a/assets/js/controllers/firstTime.controller.js b/assets/js/controllers/firstTime.controller.js
diff --git a/assets/js/controllers/home.controller.js b/assets/js/controllers/home.controller.js
@@ -22,15 +22,4 @@ function HomeCtrl ($scope, Wallet, $uibModal) {
       return null;
     }
   };
-
-  if (Wallet.status.firstTime) {
-    $uibModal.open({
-      templateUrl: 'partials/first-login-modal.jade',
-      controller: 'FirstTimeCtrl',
-      resolve: {
-        firstTime: () => { Wallet.status.firstTime = false; }
-      },
-      windowClass: 'bc-modal rocket-modal initial'
-    });
-  }
 }
diff --git a/assets/js/controllers/navigation.controller.js b/assets/js/controllers/navigation.controller.js
@@ -77,7 +77,7 @@ function NavigationCtrl ($scope, $rootScope, $interval, $timeout, $cookies, Wall
     });
   };
 
-  if ($scope.status.firstTime) {
+  if (Wallet.goal.firstTime) {
     $scope.viewedWhatsNew();
   }
 

diff --git a/assets/js/controllers/wallet.controller.js b/assets/js/controllers/wallet.controller.js
@@ -154,6 +154,13 @@ function WalletCtrl ($scope, $rootScope, Wallet, $uibModal, $timeout, Alerts, $i
         });
         Wallet.goal.auth = void 0;
       }
+      if (Wallet.goal.firstTime) {
+        $uibModal.open({
+          templateUrl: 'partials/first-login-modal.jade',
+          windowClass: 'bc-modal rocket-modal initial'
+        });
+        Wallet.goal.firstTime = void 0;
+      }
       if (Wallet.status.didLoadTransactions && Wallet.status.didLoadBalances) {
         if (Wallet.goal.send != null) {
           $uibModal.open({

diff --git a/assets/js/services/wallet.service.js b/assets/js/services/wallet.service.js
@@ -341,7 +341,7 @@ function Wallet ($http, $window, $timeout, $location, Alerts, MyWallet, MyBlockc
       $cookies.put('session', sessionToken);
       $cookies.put('uid', uid);
       Alerts.displaySuccess('Wallet created with identifier: ' + uid, true);
-      wallet.status.firstTime = true;
+      wallet.goal.firstTime = true;
 
       let loginSuccess = (guid) => {
         success_callback(uid);

diff --git a/tests/controllers/first_time_ctrl_spec.coffee b/tests/controllers/first_time_ctrl_spec.coffee
-Original file line number
+Diff line change
@@ Expand Up @@
         });
       };
-      if ($scope.status.firstTime) {
+      if (Wallet.goal.firstTime) {
         $scope.viewedWhatsNew();
       }
@@ Expand Down @@