[IMPROVE] Rewrite Save Encryption Password Modal

app/e2e/client/rocketchat.e2e.js

@@ -1,3 +1,4 @@
+import React from 'react';
 import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
 import { ReactiveVar } from 'meteor/reactive-var';
@@ -26,6 +27,8 @@ import './events.js';
 import './tabbar';
 import { log, logError } from './logger';
 import { waitUntilFind } from './waitUntilFind';
+import { imperativeModal } from '../../../client/lib/imperativeModal';
+import GenericModal from '../../../client/components/GenericModal';
 
 let failedToDecodeKey = false;
 
@@ -151,20 +154,24 @@ class E2E extends Emitter {
 				closable: false,
 				icon: 'key',
 				action: () => {
-					modal.open({
-						title: TAPi18n.__('Save_your_encryption_password'),
-						html: true,
-						text: `<div>${ passwordRevealText }</div>`,
-						showConfirmButton: true,
-						showCancelButton: true,
-						confirmButtonText: TAPi18n.__('I_saved_my_password_close_this_message'),
-						cancelButtonText: TAPi18n.__('I_ll_do_it_later'),
-					}, (confirm) => {
-						if (!confirm) {
-							return;
-						}
-						Meteor._localStorage.removeItem('e2e.randomPassword');
-						this.closeAlert();
+					imperativeModal.open({ component: GenericModal,
+						props: {
+							variant: 'warning',
+							title: TAPi18n.__('Save_your_encryption_password'),
+							children: <div dangerouslySetInnerHTML={{ __html: passwordRevealText }} />,
+							cancelText: TAPi18n.__('I_ll_do_it_later'),
+							confirmText: TAPi18n.__('I_saved_my_password_close_this_message'),
+							onClose: imperativeModal.close,
+							onCancel: () => {
+								this.closeAlert();
+								imperativeModal.close();
+							},
+							onConfirm: () => {
+								Meteor._localStorage.removeItem('e2e.randomPassword');
+								this.closeAlert();
+								imperativeModal.close();
+							},
+						},
 					});
 				},
 			});

packages/rocketchat-i18n/i18n/en.i18n.json

@@ -2043,8 +2043,8 @@
   "How_responsive_was_the_chat_agent": "How responsive was the chat agent?",
   "How_satisfied_were_you_with_this_chat": "How satisfied were you with this chat?",
   "How_to_handle_open_sessions_when_agent_goes_offline": "How to Handle Open Sessions When Agent Goes Offline",
-  "I_ll_do_it_later": "I'll do it later",
-  "I_saved_my_password_close_this_message": "I saved my password, close this message",
+  "I_ll_do_it_later": "Do It Later",
+  "I_saved_my_password_close_this_message": "I Saved My Password",
   "Idle_Time_Limit": "Idle Time Limit",
   "Idle_Time_Limit_Description": "Period of time until status changes to away. Value needs to be in seconds.",
   "if_they_are_from": "(if they are from %s)",
@@ -3567,7 +3567,7 @@
   "Save_Mobile_Bandwidth": "Save Mobile Bandwidth",
   "Save_to_enable_this_action": "Save to enable this action",
   "Save_To_Webdav": "Save to WebDAV",
-  "Save_your_encryption_password": "Save your encryption password",
+  "Save_your_encryption_password": "Save Your Encryption Password",
   "save-others-livechat-room-info": "Save Others Omnichannel Room Info",
   "save-others-livechat-room-info_description": "Permission to save information from other omnichannel rooms",
   "Saved": "Saved",