From e6c2abff485fb6b94a2467992f65a6f7da78b50e Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 13 Jan 2021 11:02:41 +1100
Subject: [PATCH] mandatory upgrade of session ids are now in force

---
 .../session/SessionIDResetDialog.tsx          | 47 ++++++-------------
 1 file changed, 14 insertions(+), 33 deletions(-)

diff --git a/ts/components/session/SessionIDResetDialog.tsx b/ts/components/session/SessionIDResetDialog.tsx
index ba34c0df3..a69db27ce 100644
--- a/ts/components/session/SessionIDResetDialog.tsx
+++ b/ts/components/session/SessionIDResetDialog.tsx
@@ -12,58 +12,39 @@ type Props = {
 /* tslint:disable:use-simple-attributes */
 
 const SessionIDResetDialogInner = (props: Props) => {
-  const [firstScreen, setFirstScreen] = useState(true);
+  const description =
+    'We’ve upgraded Session IDs to make them even more private and secure. To ensure your continued privacy you are now required to upgrade.\n\n\
+    Your existing contacts and conversations will be lost, but you’ll be able to use Session knowing you have the best privacy and security possible.';
 
-  const descFirst =
-    'We’ve upgraded Session IDs to make them even more private and secure. We recommend upgrading to a new Session ID now.\n\n\
-  You will lose existing contacts and conversations, but you’ll gain even more privacy and security. You will need to upgrade your Session ID eventually, but you can choose to delay the upgrade if you need to save contacts or conversations.';
-
-  const descSecond =
-    'You’re upgrading to a new Session ID. This will give you improved privacy and security, but it will clear ALL app data. Contacts and conversations will be lost. Proceed?';
   return (
     <SessionModal
-      title={
-        (firstScreen && 'Session IDs Just Got Better') || 'Upgrade Session ID?'
-      }
+      title="Mandatory Upgrade Session ID"
       onOk={() => null}
-      onClose={props.onClose}
+      onClose={() => null}
       theme={props.theme}
     >
       <div className="spacer-sm" />
       <div className="session-modal__centered text-center">
-        {firstScreen && (
-          <SessionIcon
-            iconType={SessionIconType.Shield}
-            iconSize={SessionIconSize.Max}
-            theme={props.theme}
-          />
-        )}
+        <SessionIcon
+          iconType={SessionIconType.Shield}
+          iconSize={SessionIconSize.Max}
+          theme={props.theme}
+        />
         <div className="spacer-lg" />
 
-        {(firstScreen && descFirst) || descSecond}
-
+        {description}
         <div className="spacer-xs" />
       </div>
       <div className="spacer-lg" />
 
       <div className="session-modal__button-group">
         <SessionButton
-          text={(firstScreen && 'Upgrade Now') || window.i18n('ok')}
-          onClick={() => {
-            if (firstScreen) {
-              setFirstScreen(false);
-            } else {
-              window.deleteAccount('Session ID Upgrade');
-              props.onClose();
-            }
-          }}
-          buttonColor={SessionButtonColor.Danger}
-        />
-        <SessionButton
-          text={(firstScreen && 'Upgrade Later') || window.i18n('cancel')}
+          text="Upgrade Now"
           onClick={() => {
+            window.deleteAccount('Session ID Upgrade');
             props.onClose();
           }}
+          buttonColor={SessionButtonColor.Danger}
         />
       </div>
     </SessionModal>