From 493508e467ad88a107dcecd613537acc14b82275 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 18 Jan 2018 16:25:15 -0500
Subject: [PATCH] 2fa page updates

---
 src/_locales/en/messages.json                             | 3 +++
 .../app/accounts/accountsLoginTwoFactorController.js      | 8 +++-----
 .../app/accounts/accountsTwoFactorMethodsController.js    | 2 +-
 src/popup/app/accounts/views/accountsLoginTwoFactor.html  | 4 ++--
 src/popup/less/components.less                            | 5 -----
 5 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index 58c26081a1..0353f8acc5 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -977,5 +977,8 @@
   },
   "clear": {
     "message": "Clear"
+  },
+  "2faNewWindowMessage": {
+    "message": "Complete your two-step login request using the new tab."
   }
 }
diff --git a/src/popup/app/accounts/accountsLoginTwoFactorController.js b/src/popup/app/accounts/accountsLoginTwoFactorController.js
index 32665ce14e..c9684785ca 100644
--- a/src/popup/app/accounts/accountsLoginTwoFactorController.js
+++ b/src/popup/app/accounts/accountsLoginTwoFactorController.js
@@ -77,14 +77,12 @@ angular
             $scope.loginPromise = authService.logIn(email, masterPassword, $scope.providerType, token, $scope.remember.checked);
             $scope.loginPromise.then(function () {
                 $analytics.eventTrack('Logged In From Two-step');
-                $state.go('tabs.vault', { animation: 'in-slide-left', syncOnLoad: true }).then(function(){
+                $state.go('tabs.vault', { animation: 'in-slide-left', syncOnLoad: true }).then(function () {
                     if (sendSuccessToTab) {
-                        $timeout(function() {
+                        $timeout(function () {
                             BrowserApi.tabSendMessage(sendSuccessToTab, {
                                 command: '2faPageData',
-                                data: {
-                                    type: 'success'
-                                }
+                                data: { type: 'success' }
                             });
                         }, 1000);
                     }
diff --git a/src/popup/app/accounts/accountsTwoFactorMethodsController.js b/src/popup/app/accounts/accountsTwoFactorMethodsController.js
index 09f1cf6e4f..333f759b14 100644
--- a/src/popup/app/accounts/accountsTwoFactorMethodsController.js
+++ b/src/popup/app/accounts/accountsTwoFactorMethodsController.js
@@ -2,7 +2,7 @@ angular
     .module('bit.accounts')
 
     .controller('accountsTwoFactorMethodsController', function ($scope, $state, $stateParams, constantsService,
-        utilsService, i18nService, $analytics) {
+        utilsService, i18nService, $analytics, platformUtilsService) {
         $scope.i18n = i18nService;
 
         var constants = constantsService;
diff --git a/src/popup/app/accounts/views/accountsLoginTwoFactor.html b/src/popup/app/accounts/views/accountsLoginTwoFactor.html
index a7cbe79b35..afc56a339e 100644
--- a/src/popup/app/accounts/views/accountsLoginTwoFactor.html
+++ b/src/popup/app/accounts/views/accountsLoginTwoFactor.html
@@ -55,8 +55,8 @@
         <div id="duoFrameWrapper" ng-if="!showNewWindowMessage">
             <iframe id="duo_iframe"></iframe>
         </div>
-        <div ng-if="showNewWindowMessage">
-            <div class="two-step-window-message">Complete your two-step login request using the new window.</div>
+        <div ng-if="showNewWindowMessage" class="two-factor-key-page">
+            <p>{{i18n.2faNewWindowMessage}}</p>
         </div>
         <div class="list">
             <div class="list-section">
diff --git a/src/popup/less/components.less b/src/popup/less/components.less
index a5e541a0cc..cbfa48b958 100644
--- a/src/popup/less/components.less
+++ b/src/popup/less/components.less
@@ -587,11 +587,6 @@
     }
 }
 
-.two-step-window-message {
-    text-align: center;
-    margin: 30px 0 20px 0;
-}
-
 #duoFrameWrapper {
     background: ~"url('../images/loading.svg') 0 0 no-repeat";
     width: 100%;