diff --git a/apps/mobile/app/common/design/theme.ts b/apps/mobile/app/common/design/theme.ts index 59aba2d68..cb259645a 100644 --- a/apps/mobile/app/common/design/theme.ts +++ b/apps/mobile/app/common/design/theme.ts @@ -49,7 +49,7 @@ export const THEME_LIGHT: ThemeDefinition = { heading: "#181818", icon: "#181818", separator: "#F0F0F0", - placeholder: "#a9a9a9", + placeholder: "#858585", hover: "#eee", backdrop: "#0000001a", buttonForeground: "#FFFFFF" @@ -63,7 +63,7 @@ export const THEME_LIGHT: ThemeDefinition = { heading: "#4B4B4B", icon: "#666666", separator: "#E8E8E8", - placeholder: "#a9a9a9", + placeholder: "#999999", hover: "#dbdbdb", backdrop: "#0000001a", buttonForeground: "#181818" @@ -101,7 +101,7 @@ export const THEME_LIGHT: ThemeDefinition = { background: "#00883610", border: "#008836", heading: "#212121", - icon: "#FFFFFF", + icon: "#181818", separator: "#E8E8E8", placeholder: "#a9a9a9", hover: "#eee", @@ -146,13 +146,18 @@ export const THEME_LIGHT: ThemeDefinition = { }, secondary: { background: "#EEEEEE" }, selected: { - background: "#ddd", + background: "#00883610", hover: "#eee" } }, contextMenu: { primary: { background: "#f7f7f7" } }, editor: { selected: { background: "#e1e1e1" } }, - sheet: { selected: { paragraph: "#008836" } } + sheet: { selected: { paragraph: "#008836" } }, + list: { + secondary: { + heading: "#A6A6A6" + } + } } }; diff --git a/apps/mobile/app/components/auth/login.tsx b/apps/mobile/app/components/auth/login.tsx index 41b52bf00..3b2cb8847 100644 --- a/apps/mobile/app/components/auth/login.tsx +++ b/apps/mobile/app/components/auth/login.tsx @@ -238,6 +238,9 @@ export const Login = ({ fontFamily="REGULAR" fontSize={AppFontSize.sm} type="plain" + textStyle={{ + color: colors.secondary.paragraph + }} /> void + callback: (success: boolean) => void, + onerror: (error: Error) => void ) => { try { const success = await db.user.authenticateMultiFactorCode( @@ -342,6 +346,8 @@ export const Login = ({ if ((e as Error).message === "invalid_grant") { setLoading(false); setStep(LoginSteps.emailAuth); + } else { + onerror(e as Error); } } }} diff --git a/apps/mobile/app/components/auth/two-factor.tsx b/apps/mobile/app/components/auth/two-factor.tsx index fe52f2b1b..6db55cb9b 100644 --- a/apps/mobile/app/components/auth/two-factor.tsx +++ b/apps/mobile/app/components/auth/two-factor.tsx @@ -158,6 +158,7 @@ const TwoFactorVerification = ({ setSending(false); } catch (e) { setSending(false); + console.log("error e"); setError( new Error(`Error sending 2FA Code. Tap "Send code" to try again `) ); @@ -268,7 +269,9 @@ const TwoFactorVerification = ({ style={{ textAlign: "center", marginVertical: DefaultAppStyles.GAP_VERTICAL_SMALL, - maxWidth: 250 + maxWidth: 250, + alignSelf: "center", + marginTop: -10 }} >