From af298936d95bcab4921e7ad7d908bb95cffbc7f0 Mon Sep 17 00:00:00 2001
From: Warrick Corfe-Tan <warrickct@gmail.com>
Date: Tue, 17 Aug 2021 10:05:12 +1000
Subject: [PATCH] Combining and 80 and 90 completion stages.

---
 _locales/en/messages.json                     |  4 +--
 .../session/LeftPaneSectionHeader.tsx         | 29 +++++++++----------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index cbfa1aab0..13971d932 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -427,10 +427,8 @@
   "dialogClearAllDataDeletionQuestion": "Would you like to clear only this device, or delete your entire account?",
   "deviceOnly": "Device Only",
   "entireAccount": "Entire Account",
-  "recoveryPhraseSecureMessage": "Secure your account by saving your recovery phrase",
   "recoveryPhraseSecureTitle": "You're almost finished!",
-  "recoveryPhraseSecureButtonText": "Secure your account",
-  "recoveryPhraseRevealMessage": "Reveal your recovery phrase then store it safely to secure it",
+  "recoveryPhraseRevealMessage": "Secure your account by saving your recovery phrase. Reveal your recovery phrase then store it safely to secure it",
   "recoveryPhraseRevealButtonText": "Reveal Recovery Phrase",
   "recoveryPhraseInfoMessage": "Meet your recovery phrase Your recovery phrase is the master key to your session ID - you can use it to restore your Session ID if you lose access to your device, Store your recovery phrase in a safe place, and don't give it to anyone.",
   "recoveryPhraseCompleteTitle": "Account secured!"
diff --git a/ts/components/session/LeftPaneSectionHeader.tsx b/ts/components/session/LeftPaneSectionHeader.tsx
index d530d25a4..bd98b5aba 100644
--- a/ts/components/session/LeftPaneSectionHeader.tsx
+++ b/ts/components/session/LeftPaneSectionHeader.tsx
@@ -8,6 +8,7 @@ import { UserUtils } from '../../session/utils';
 import { useDispatch, useSelector } from 'react-redux';
 import { disableRecoveryPhrasePrompt } from '../../state/ducks/userConfig';
 import { getShowRecoveryPhrasePrompt } from '../../state/selectors/userConfig';
+import { recoveryPhraseModal } from '../../state/ducks/modalDialog';
 
 const Tab = ({
   isSelected,
@@ -69,9 +70,9 @@ export const LeftPaneSectionHeader = (props: Props) => {
 };
 
 export const LeftPaneBanner = () => {
-  const [completion, setCompletion] = useState(80);
-  const [bodyText, setBodyText] = useState(window.i18n('recoveryPhraseSecureMessage'));
-  const [buttonText, setButtonText] = useState(window.i18n('recoveryPhraseSecureButtonText'));
+  const [completion, setCompletion] = useState(90);
+  const [bodyText, setBodyText] = useState(window.i18n('recoveryPhraseRevealMessage'));
+  const [buttonText, setButtonText] = useState(window.i18n('recoveryPhraseRevealButtonText'));
   const [recoveryPhraseHidden, setRecoveryPhraseHidden] = useState(true);
   const [isCompleted, setIsCompleted] = useState(false);
   const [bannerTitle, setBannerTitle] = useState(window.i18n('recoveryPhraseSecureTitle'));
@@ -79,20 +80,18 @@ export const LeftPaneBanner = () => {
   const secondsBeforeRemoval = 2 * 1000;
   const completionText = `${completion}%`;
 
+  const dispatch = useDispatch();
+
   const handleShowRecoveryClick = () => {
-    setRecoveryPhraseHidden(false);
-    setBodyText(window.i18n('recoveryPhraseInfoMessage'));
-    setButtonText(window.i18n('copy'));
-  };
+    // setRecoveryPhraseHidden(false);
+    // setBodyText(window.i18n('recoveryPhraseInfoMessage'));
+    // setButtonText(window.i18n('copy'));
 
-  const handleSecureClick = () => {
-    if (completion === 80) {
-      setCompletion(90);
-      setBodyText(window.i18n('recoveryPhraseRevealMessage'));
-      setButtonText(window.i18n('recoveryPhraseRevealButtonText'));
-    }
+    // show a modal
+    dispatch(recoveryPhraseModal({}))
   };
 
+
   const BannerInner = (props: any) => {
     const dispatch = useDispatch();
 
@@ -111,9 +110,7 @@ export const LeftPaneBanner = () => {
     };
 
     const onClick =
-      completion === 80
-        ? handleSecureClick
-        : completion === 90
+      completion === 90
         ? recoveryPhraseHidden
           ? handleShowRecoveryClick
           : handleCopyPhraseClick