attempting fixes

dylmye · May 26, 2023 · 0981c1c · 0981c1c
1 parent 06c99d8
commit 0981c1c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/src/components/TripItemTypeCard/index.tsx b/src/components/TripItemTypeCard/index.tsx
@@ -24,8 +24,8 @@ const TripItemTypeCard = ({ item, onClick }: Props) => {
       onClick={() => onClick(item)}
       sx={{
         textTransform: "capitalize",
-        color: "#ffffff",
-        borderColor: "#ffffff",
+        color: "palette.action.active",
+        borderColor: "palette.action.active",
       }}>
       {friendlyName ?? item}
     </Button>

diff --git a/src/components/dialogs/AuthenticationModal/SignInContent.tsx b/src/components/dialogs/AuthenticationModal/SignInContent.tsx
@@ -76,7 +76,10 @@ const SignInContent = ({ onClose }: AuthModalContentProps) => {
         )}
         <GoogleSignInButton
           alreadyHasAccount
-          onClick={() => signInWithGoogle([])}
+          onClick={() => {
+            signInWithGoogle([]);
+            onClose(true);
+          }}
           disabled={formLoading}
         />
       </Stack>

diff --git a/src/components/dialogs/AuthenticationModal/SignUpContent.tsx b/src/components/dialogs/AuthenticationModal/SignUpContent.tsx
@@ -43,7 +43,7 @@ import { AuthModalContentProps } from ".";
 // @ts-ignore it only applies to string
 YupPassword({ string: yString, addMethod });
 
-type SignupEmailForm = {
+interface SignupEmailForm {
   /** user id */
   email: string;
   /** pw to use */
@@ -52,7 +52,7 @@ type SignupEmailForm = {
   checkedPrivacy: boolean;
   /** hcaptcha token */
   verify?: string;
-};
+}
 
 /** Firebase Auth-linked Formik form for creating a new account */
 const SignUpContent = ({ onClose }: AuthModalContentProps) => {
@@ -121,7 +121,10 @@ const SignUpContent = ({ onClose }: AuthModalContentProps) => {
         )}
         <GoogleSignInButton
           alreadyHasAccount={false}
-          onClick={() => signInWithGoogle([])}
+          onClick={() => {
+            signInWithGoogle([]);
+            onClose(true);
+          }}
         />
       </Stack>
       <Divider>