fix: review requests

new-lamassu-admin/src/pages/Authentication/LoginCard.js

@@ -84,7 +84,6 @@ const LoginCard = () => {
   }
 
   return (
-    <div>
     <Paper elevation={1}>
       <div className={classes.wrapper}>
         <div className={classes.titleWrapper}>
@@ -94,7 +93,6 @@ const LoginCard = () => {
         {renderState()}
       </div>
     </Paper>
-    </div>
   )
 }
 

new-lamassu-admin/src/pages/Authentication/Setup2FAState.js

@@ -81,8 +81,8 @@ const Setup2FAState = ({
   }
 
   return (
-    <>
-      {secret && otpauth ? (
+    secret &&
+    otpauth && (
       <>
         <div className={classes.infoWrapper}>
           <Label2 className={classes.info2}>
@@ -91,9 +91,9 @@ const Setup2FAState = ({
             system, a two-factor authentication is enforced.
           </Label2>
           <Label2 className={classes.info2}>
-              To finish this process, please scan the following QR code or
-              insert the secret further below on an authentication app of your
-              choice, such as Google Authenticator or Authy.
+            To finish this process, please scan the following QR code or insert
+            the secret further below on an authentication app of your choice,
+            such as Google Authenticator or Authy.
           </Label2>
         </div>
         <div className={classes.qrCodeWrapper}>
@@ -101,8 +101,7 @@ const Setup2FAState = ({
         </div>
         <div className={classes.secretWrapper}>
           <Label2 className={classes.secretLabel}>Your secret:</Label2>
-            <Label2
-              className={isShowing ? classes.secret : classes.hiddenSecret}>
+          <Label2 className={isShowing ? classes.secret : classes.hiddenSecret}>
             {secret}
           </Label2>
           <ActionButton
@@ -148,10 +147,7 @@ const Setup2FAState = ({
           </Button>
         </div>
       </>
-      ) : (
-        <div></div>
-      )}
-    </>
+    )
   )
 }
 

new-lamassu-admin/src/pages/UserManagement/UserManagement.styles.js

@@ -100,7 +100,7 @@ const styles = {
     overflowX: 'auto',
     width: '92.5%'
   },
-  test1: {
+  linkWrapper: {
     width: '100%',
     height: '100%',
     overflow: 'hidden',

new-lamassu-admin/src/pages/UserManagement/modals/ChangeRoleModal.js

@@ -24,8 +24,7 @@ const ChangeRoleModal = ({
   }
 
   return (
-    <>
-      {showModal && (
+    showModal && (
       <Modal
         closeOnBackdropClick={true}
         width={450}
@@ -59,8 +58,7 @@ const ChangeRoleModal = ({
           </Button>
         </div>
       </Modal>
-      )}
-    </>
+    )
   )
 }
 

new-lamassu-admin/src/pages/UserManagement/modals/CreateUserModal.js

@@ -10,7 +10,7 @@ import ErrorMessage from 'src/components/ErrorMessage'
 import Modal from 'src/components/Modal'
 import { Button } from 'src/components/buttons'
 import { TextInput, RadioGroup } from 'src/components/inputs/formik'
-import { H1, H2, H3, Info3, Mono } from 'src/components/typography'
+import { H1, H3, Info2, P, Mono } from 'src/components/typography'
 import CopyToClipboard from 'src/pages/Transactions/CopyToClipboard'
 
 import styles from '../UserManagement.styles'
@@ -139,19 +139,24 @@ const CreateUserModal = ({ showModal, toggleModal }) => {
       {showModal && createUserURL && (
         <Modal
           closeOnBackdropClick={true}
-          width={600}
-          height={275}
+          width={500}
+          height={200}
           handleClose={handleClose}
           open={true}>
-          <H2 className={classes.modalTitle}>Creating {usernameField}...</H2>
-          <Info3 className={classes.info}>
+          <Info2 className={classes.modalTitle}>
+            Creating {usernameField}...
+          </Info2>
+          <P className={classes.info}>
             Safely share this link with {usernameField} to finish the
             registration process.
-          </Info3>
+          </P>
           <div className={classes.addressWrapper}>
             <Mono className={classes.address}>
               <strong>
-                <CopyToClipboard buttonClassname={classes.copyToClipboard}>
+                <CopyToClipboard
+                  className={classes.link}
+                  buttonClassname={classes.copyToClipboard}
+                  wrapperClassname={classes.linkWrapper}>
                   {createUserURL}
                 </CopyToClipboard>
               </strong>

new-lamassu-admin/src/pages/UserManagement/modals/DeleteUserModal.js

@@ -24,8 +24,7 @@ const DeleteUserModal = ({
   }
 
   return (
-    <>
-      {showModal && (
+    showModal && (
       <Modal
         closeOnBackdropClick={true}
         width={600}
@@ -66,8 +65,7 @@ const DeleteUserModal = ({
           </Button>
         </div>
       </Modal>
-      )}
-    </>
+    )
   )
 }
 

new-lamassu-admin/src/pages/UserManagement/modals/EnableUserModal.js

@@ -24,8 +24,7 @@ const EnableUserModal = ({
   }
 
   return (
-    <>
-      {showModal && (
+    showModal && (
       <Modal
         closeOnBackdropClick={true}
         width={450}
@@ -84,8 +83,7 @@ const EnableUserModal = ({
           </Button>
         </div>
       </Modal>
-      )}
-    </>
+    )
   )
 }
 

new-lamassu-admin/src/pages/UserManagement/modals/Input2FAModal.js

@@ -55,8 +55,7 @@ const Input2FAModal = ({ showModal, toggleModal, action, vars }) => {
   }
 
   return (
-    <>
-      {showModal && (
+    showModal && (
       <Modal
         closeOnBackdropClick={true}
         width={500}
@@ -94,8 +93,7 @@ const Input2FAModal = ({ showModal, toggleModal, action, vars }) => {
           </Button>
         </div>
       </Modal>
-      )}
-    </>
+    )
   )
 }
 

new-lamassu-admin/src/pages/UserManagement/modals/Reset2FAModal.js

@@ -17,8 +17,7 @@ const Reset2FAModal = ({ showModal, toggleModal, reset2FAURL, user }) => {
   }
 
   return (
-    <>
-      {showModal && (
+    showModal && (
       <Modal
         closeOnBackdropClick={true}
         width={500}
@@ -38,15 +37,14 @@ const Reset2FAModal = ({ showModal, toggleModal, reset2FAURL, user }) => {
               <CopyToClipboard
                 className={classes.link}
                 buttonClassname={classes.copyToClipboard}
-                  wrapperClassname={classes.test1}>
+                wrapperClassname={classes.linkWrapper}>
                 {reset2FAURL}
               </CopyToClipboard>
             </strong>
           </Mono>
         </div>
       </Modal>
-      )}
-    </>
+    )
   )
 }
 

new-lamassu-admin/src/pages/UserManagement/modals/ResetPasswordModal.js

@@ -22,8 +22,7 @@ const ResetPasswordModal = ({
   }
 
   return (
-    <>
-      {showModal && (
+    showModal && (
       <Modal
         closeOnBackdropClick={true}
         width={500}
@@ -42,15 +41,14 @@ const ResetPasswordModal = ({
               <CopyToClipboard
                 className={classes.link}
                 buttonClassname={classes.copyToClipboard}
-                  wrapperClassname={classes.test1}>
+                wrapperClassname={classes.linkWrapper}>
                 {resetPasswordURL}
               </CopyToClipboard>
             </strong>
           </Mono>
         </div>
       </Modal>
-      )}
-    </>
+    )
   )
 }
 

new-lamassu-admin/src/routing/routes.js

@@ -21,7 +21,6 @@ import ResetPassword from 'src/pages/Authentication/ResetPassword'
 import Blacklist from 'src/pages/Blacklist'
 import Cashout from 'src/pages/Cashout'
 import Commissions from 'src/pages/Commissions'
-// import ConfigMigration from 'src/pages/ConfigMigration'
 import { Customers, CustomerProfile } from 'src/pages/Customers'
 import Dashboard from 'src/pages/Dashboard'
 import Funding from 'src/pages/Funding'