Rm password check

safe-global · May 27, 2024 · ae4aa89 · ae4aa89
1 parent ccc4008
commit ae4aa89
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 60 deletions.
diff --git a/src/components/common/PageLayout/index.tsx b/src/components/common/PageLayout/index.tsx
@@ -9,7 +9,6 @@ import SideDrawer from './SideDrawer'
 import { useIsSidebarRoute } from '@/hooks/useIsSidebarRoute'
 import { TxModalContext } from '@/components/tx-flow'
 import BatchSidebar from '@/components/batch/BatchSidebar'
-import SocialLoginDeprecation from '@/components/common/SocialLoginDeprecation'
 
 const PageLayout = ({ pathname, children }: { pathname: string; children: ReactElement }): ReactElement => {
   const [isSidebarRoute, isAnimated] = useIsSidebarRoute(pathname)
@@ -36,8 +35,6 @@ const PageLayout = ({ pathname, children }: { pathname: string; children: ReactE
         })}
       >
         <div className={css.content}>
-          <SocialLoginDeprecation />
-
           <SafeLoadingError>{children}</SafeLoadingError>
         </div>
 

diff --git a/src/components/common/SocialSigner/index.tsx b/src/components/common/SocialSigner/index.tsx
@@ -125,7 +125,7 @@ export const SocialSigner = ({ socialWalletService, wallet, onLogin, onRequirePa
                 }}
               />
               <Box display="flex" flexDirection="row" alignItems="center" gap={1}>
-                <SvgIcon component={GoogleLogo} inheritViewBox fontSize="medium" /> Continue with Google
+                <SvgIcon component={GoogleLogo} inheritViewBox fontSize="medium" /> Login with Google
               </Box>
             </Button>
           </Track>

diff --git a/src/components/settings/SecurityLogin/SocialSignerExport/ExportMPCAccountModal.tsx b/src/components/settings/SecurityLogin/SocialSignerExport/ExportMPCAccountModal.tsx
@@ -79,7 +79,11 @@ const ExportMPCAccountModal = ({ onClose, open }: { onClose: () => void; open: b
       <DialogContent>
         <form onSubmit={handleSubmit(onSubmit)}>
           <Box display="flex" flexDirection="column" gap={2} alignItems="flex-start" sx={{ width: '100%' }}>
-            <Typography>For security reasons you have to enter your password to reveal your account key.</Typography>
+            <Typography>
+              {' '}
+              Never disclose your keys or seed phrase to anyone. If someone gains access to them, they will have access
+              to your account.
+            </Typography>
 
             {exportedKey ? (
               <Box display="flex" flexDirection="row" alignItems="center" gap={1} width="100%">
@@ -103,21 +107,8 @@ const ExportMPCAccountModal = ({ onClose, open }: { onClose: () => void; open: b
                   {...register(ExportFieldNames.pk)}
                 />
               </Box>
-            ) : (
-              <>
-                <TextField
-                  placeholder="Password"
-                  label="Password"
-                  type="password"
-                  fullWidth
-                  error={!!formState.errors[ExportFieldNames.password]}
-                  helperText={formState.errors[ExportFieldNames.password]?.message}
-                  {...register(ExportFieldNames.password, {
-                    required: true,
-                  })}
-                />
-              </>
-            )}
+            ) : null}
+
             {error && <ErrorMessage className={css.modalError}>{error}</ErrorMessage>}
 
             <Box

diff --git a/src/components/settings/SecurityLogin/SocialSignerExport/index.tsx b/src/components/settings/SecurityLogin/SocialSignerExport/index.tsx
@@ -1,44 +1,36 @@
 import Track from '@/components/common/Track'
 import { MPC_WALLET_EVENTS } from '@/services/analytics/events/mpcWallet'
-import { Alert, Box, Button, Tooltip, Typography } from '@mui/material'
+import { Box, Button, Typography } from '@mui/material'
 import { useState } from 'react'
 import ExportMPCAccountModal from '@/components/settings/SecurityLogin/SocialSignerExport/ExportMPCAccountModal'
 import useSocialWallet from '@/hooks/wallets/mpc/useSocialWallet'
 
 const SocialSignerExport = () => {
   const [isModalOpen, setIsModalOpen] = useState(false)
-
   const socialWalletService = useSocialWallet()
 
-  const isPasswordSet = socialWalletService?.isRecoveryPasswordSet() ?? false
-
   return (
     <>
-      <Box display="flex" flexDirection="column" gap={2} alignItems="flex-start">
-        <Typography>
-          Signers created via Google can be exported and imported to any non-custodial wallet outside of Safe.
-        </Typography>
-        <Alert severity="warning">
-          Never disclose your keys or seed phrase to anyone. If someone gains access to them, they have full access over
-          your social login signer.
-        </Alert>
+      <Typography>
+        Signers created via Google can be exported and imported to any non-custodial wallet outside of Safe.
+      </Typography>
 
+      <Box display="flex" mt={3} gap={2} alignItems="center">
         <Track {...MPC_WALLET_EVENTS.REVEAL_PRIVATE_KEY}>
-          <Tooltip title={isPasswordSet ? '' : 'Private key export is only available if you set a recovery password'}>
-            <span>
-              <Button
-                color="primary"
-                variant="contained"
-                sx={{ pointerEvents: 'all !important' }}
-                disabled={isModalOpen || !isPasswordSet}
-                onClick={() => setIsModalOpen(true)}
-              >
-                Reveal private key
-              </Button>
-            </span>
-          </Tooltip>
+          <Button
+            color="primary"
+            variant="contained"
+            sx={{ pointerEvents: 'all !important' }}
+            disabled={!socialWalletService || isModalOpen}
+            onClick={() => setIsModalOpen(true)}
+          >
+            Reveal private key
+          </Button>
         </Track>
+
+        {!socialWalletService && <Typography>Please login with your Google account first.</Typography>}
       </Box>
+
       <ExportMPCAccountModal onClose={() => setIsModalOpen(false)} open={isModalOpen} />
     </>
   )

diff --git a/src/components/settings/SecurityLogin/index.tsx b/src/components/settings/SecurityLogin/index.tsx
@@ -1,30 +1,17 @@
 import { Box, Grid, Paper, Typography } from '@mui/material'
-import SocialSignerMFA from './SocialSignerMFA'
 import SocialSignerExport from './SocialSignerExport'
 
 const SecurityLogin = () => {
   return (
     <Box display="flex" flexDirection="column" gap={2}>
-      <Paper sx={{ p: 4 }}>
-        <Grid container spacing={3}>
-          <Grid item lg={4} xs={12}>
-            <Typography variant="h4" fontWeight="bold" mb={1}>
-              Multi-factor Authentication
-            </Typography>
-          </Grid>
-
-          <Grid item xs>
-            <SocialSignerMFA />
-          </Grid>
-        </Grid>
-      </Paper>
       <Paper sx={{ p: 4, mt: 2 }}>
         <Grid container spacing={3}>
           <Grid item lg={4} xs={12}>
             <Typography variant="h4" fontWeight="bold" mb={1}>
-              Social login signer export
+              Google login export
             </Typography>
           </Grid>
+
           <Grid item xs>
             <SocialSignerExport />
           </Grid>