diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json index 58c26081a19..0353f8acc5e 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 32665ce14ec..c9684785caf 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 09f1cf6e4f8..333f759b14b 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 a7cbe79b35b..afc56a339ed 100644 --- a/src/popup/app/accounts/views/accountsLoginTwoFactor.html +++ b/src/popup/app/accounts/views/accountsLoginTwoFactor.html @@ -55,8 +55,8 @@
-
-
Complete your two-step login request using the new window.
+
+

{{i18n.2faNewWindowMessage}}

diff --git a/src/popup/less/components.less b/src/popup/less/components.less index a5e541a0ccd..cbfa48b9583 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%;