From f2a69daf0306d024d71f6274499f1e9d36681fe5 Mon Sep 17 00:00:00 2001
From: Paul <paulmakles@gmail.com>
Date: Sun, 25 Jul 2021 13:55:45 +0100
Subject: [PATCH] Fix onboarding.
---
src/context/intermediate/Modals.tsx | 2 +-
src/context/intermediate/modals/Onboarding.tsx | 2 +-
src/context/revoltjs/RevoltClient.tsx | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/context/intermediate/Modals.tsx b/src/context/intermediate/Modals.tsx
index ce4e62c..5839c66 100644
--- a/src/context/intermediate/Modals.tsx
+++ b/src/context/intermediate/Modals.tsx
@@ -17,7 +17,7 @@ export interface Props {
export default function Modals({ screen, openScreen }: Props) {
const onClose = () =>
- isModalClosing
+ isModalClosing || screen.id === "onboarding"
? openScreen({ id: "none" })
: internalEmit("Modal", "close");
diff --git a/src/context/intermediate/modals/Onboarding.tsx b/src/context/intermediate/modals/Onboarding.tsx
index 160f521..8ca9399 100644
--- a/src/context/intermediate/modals/Onboarding.tsx
+++ b/src/context/intermediate/modals/Onboarding.tsx
@@ -28,7 +28,7 @@ export function OnboardingModal({ onClose, callback }: Props) {
const onSubmit: SubmitHandler<FormInputs> = ({ username }) => {
setLoading(true);
callback(username, true)
- .then(onClose)
+ .then(() => onClose())
.catch((err: any) => {
setError(takeError(err));
setLoading(false);
diff --git a/src/context/revoltjs/RevoltClient.tsx b/src/context/revoltjs/RevoltClient.tsx
index b457446..6c8b3ac 100644
--- a/src/context/revoltjs/RevoltClient.tsx
+++ b/src/context/revoltjs/RevoltClient.tsx
@@ -116,7 +116,7 @@ function Context({ auth, children }: Props) {
if (onboarding) {
openScreen({
id: "onboarding",
- callback: (username: string) =>
+ callback: async (username: string) =>
onboarding(username, true).then(login),
});
} else {
--
GitLab