running yarn ready

ts/components/session/LeftPaneSectionHeader.tsx

@@ -68,14 +68,13 @@ export const LeftPaneSectionHeader = (props: Props) => {
   );
 };
 
-export const LeftPaneBanner = (Props: any) => {
+export const LeftPaneBanner = () => {
-
   const [completion, setCompletion] = useState(80);
   const [bodyText, setBodyText] = useState(window.i18n('recoveryPhraseSecureMessage'));
   const [buttonText, setButtonText] = useState(window.i18n('recoveryPhraseSecureButtonText'));
   const [recoveryPhraseHidden, setRecoveryPhraseHidden] = useState(true);
   const [isCompleted, setIsCompleted] = useState(false);
-  const [bannerTitle, setBannerTitle] = useState(window.i18n("recoveryPhraseSecureTitle"));
+  const [bannerTitle, setBannerTitle] = useState(window.i18n('recoveryPhraseSecureTitle'));
   const recoveryPhrase = UserUtils.getCurrentRecoveryPhrase();
   const secondsBeforeRemoval = 2 * 1000;
   const completionText = `${completion}%`;
@@ -84,7 +83,7 @@ export const LeftPaneBanner = (Props: any) => {
     setRecoveryPhraseHidden(false);
     setBodyText(window.i18n('recoveryPhraseInfoMessage'));
     setButtonText(window.i18n('copy'));
-  }
+  };
 
   const handleSecureClick = () => {
     if (completion === 80) {
@@ -92,14 +91,14 @@ export const LeftPaneBanner = (Props: any) => {
       setBodyText(window.i18n('recoveryPhraseRevealMessage'));
       setButtonText(window.i18n('recoveryPhraseRevealButtonText'));
     }
-  }
+  };
 
   const BannerInner = (props: any) => {
     const dispatch = useDispatch();
 
     const handleCopyPhraseClick = async () => {
       await navigator.clipboard.writeText(recoveryPhrase);
-      setCompletion(100)
+      setCompletion(100);
       setBannerTitle(window.i18n('recoveryPhraseCompleteTitle'));
       setBodyText('');
       setRecoveryPhraseHidden(true);
@@ -109,63 +108,57 @@ export const LeftPaneBanner = (Props: any) => {
       setTimeout(() => {
         dispatch(disableRecoveryPhrasePrompt());
       }, secondsBeforeRemoval);
-    }
+    };
-
+
-    let onClick =
+    const onClick =
-      completion === 80 ? handleSecureClick :
+      completion === 80
-        completion === 90 ?
+        ? handleSecureClick
-          recoveryPhraseHidden ?
+        : completion === 90
-            handleShowRecoveryClick :
+        ? recoveryPhraseHidden
-            handleCopyPhraseClick
+          ? handleShowRecoveryClick
+          : handleCopyPhraseClick
         : null;
 
-    // TODO: This can be refactored down. all returns have p tag + button, final has conditional phrase element.
     return (
       <StyledBannerInner>
-        <p>
+        <p>{bodyText}</p>
-          {bodyText}
+        {!recoveryPhraseHidden && (
-        </p>
-        {!recoveryPhraseHidden &&
           <StyledRecoveryPhrase
             theme={theme}
-            className="left-pane-banner___phrase" onClick={handleShowRecoveryClick}>
+            className="left-pane-banner___phrase"
+            onClick={handleShowRecoveryClick}
+          >
             {recoveryPhrase}
           </StyledRecoveryPhrase>
-        }
+        )}
-        {!isCompleted &&
+        {!isCompleted && (
           <SessionButton
             buttonType={SessionButtonType.Default}
             text={buttonText}
             onClick={onClick}
           />
-        }
+        )}
       </StyledBannerInner>
-    )
+    );
-  }
+  };
 
-  const useColumn = completion === 90 && handleShowRecoveryClick;
+  const flexDirection = completion === 90 && handleShowRecoveryClick ? 'column' : 'row';
   const theme = useTheme();
 
   return (
-    <StyledLeftPaneBanner
+    <StyledLeftPaneBanner border={useTheme().colors.sessionBorder} isCompleted={isCompleted}>
-      border={useTheme().colors.sessionBorder}
-      isCompleted={isCompleted}>
       <StyledProgressBarContainer>
-        <StyledProgressBarInner
+        <StyledProgressBarInner color={Constants.UI.COLORS.GREEN} width={`${completion}%`} />
-          color={Constants.UI.COLORS.GREEN}
-          width={completion + '%'}
-        />
       </StyledProgressBarContainer>
-      <StyledBannerTitle
+      <StyledBannerTitle theme={theme}>
-        theme={theme}>
         {bannerTitle} <span>{completionText}</span>
       </StyledBannerTitle>
-      <StyledBannerContainer flexDirection={useColumn ? 'column' : 'row'} >
+      <StyledBannerContainer flexDirection={flexDirection}>
         <BannerInner />
       </StyledBannerContainer>
     </StyledLeftPaneBanner>
-  )
+  );
-}
+};
 
 interface StyledProgressBarContainerProps {
   theme: DefaultTheme;
@@ -196,10 +189,7 @@ export const StyledBannerTitle = styled.div`
   line-height: 1.3;
   font-size: ${(p: StyledBannerTitle) => p.theme.common.fonts.md};
   font-weight: bold;
-  margin: 
+  margin: ${Constants.UI.SPACING.marginSm} ${Constants.UI.SPACING.marginSm} 0
-    ${Constants.UI.SPACING.marginSm} 
-    ${Constants.UI.SPACING.marginSm} 
-    0 
     ${Constants.UI.SPACING.marginSm};
 
   span {
@@ -219,13 +209,12 @@ export const StyledLeftPaneBanner = styled.div`
   border-bottom: ${(p: StyledLeftPaneBannerProps) => p.border};
   opacity: 1;
   transition: opacity 2s;
-  ${(p: StyledLeftPaneBannerProps) => p.isCompleted === true ?
+  ${(p: StyledLeftPaneBannerProps) =>
-    `
+    p.isCompleted === true
+      ? `
       opacity: 0;
     `
-    :
+      : null}
-    null
-  }
 `;
 
 const StyledBannerInner = styled.div`
@@ -252,14 +241,6 @@ const StyledRecoveryPhrase = styled.p`
   border: ${(props: StyledRecoveryPhraseProps) => props.theme.colors.sessionBorderHighContrast};
 `;
 
-
-// 90%
-
-// tap and hold the redacted words to reveal your recovery phrase then store it safely to secure
-
-// 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.
-
 interface StyledBannerContainerProps {
   flexDirection?: string;
 }
@@ -267,7 +248,7 @@ export const StyledBannerContainer = styled.div`
   display: flex;
   flex-direction: ${(p: StyledBannerContainerProps) => p.flexDirection};
   justify-content: space-between;
-  padding: ${Constants.UI.SPACING.marginSm}
+  padding: ${Constants.UI.SPACING.marginSm};
 `;
 
 export const StyledLeftPaneHeaderContainer = styled.div`

ts/state/ducks/userConfig.tsx

@@ -22,10 +22,8 @@ const userConfigSlice = createSlice({
       state.audioAutoplay = !state.audioAutoplay;
     },
     disableRecoveryPhrasePrompt: state => {
-      console.log('setting recovery phrase state');
+      state.showRecoveryPhrasePrompt = false;
-      state.showRecoveryPhrasePrompt = false
     },
-
   },
 });
 

ts/state/selectors/userConfig.ts

@@ -9,7 +9,6 @@ export const getAudioAutoplay = createSelector(
   (state: UserConfigState): boolean => state.audioAutoplay
 );
 
-
 export const getShowRecoveryPhrasePrompt = createSelector(
   getUserConfig,
   (state: UserConfigState): boolean => state.showRecoveryPhrasePrompt