Skip to content

[TOOL-3241] Fix previous account shown after logging out in onboarding flow #6061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 27, 2025
Merged

[TOOL-3241] Fix previous account shown after logging out in onboarding flow #6061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 30 additions & 19 deletions apps/dashboard/src/app/login/LoginPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { useDashboardRouter } from "@/lib/DashboardRouter";
import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
import { useTheme } from "next-themes";
import Link from "next/link";
import { Suspense, lazy, useState } from "react";
import { Suspense, lazy, useEffect, useState } from "react";
import { ConnectEmbed, useActiveWalletConnectionStatus } from "thirdweb/react";
import { createWallet, inAppWallet } from "thirdweb/wallets";
import { ClientOnly } from "../../components/ClientOnly/ClientOnly";
Expand Down Expand Up @@ -154,6 +154,32 @@ function PageContent(props: {
router.replace(props.redirectPath);
}

async function onLogin() {
const account = await getRawAccountAction();

// shouldn't happen - but if account is not found, stay on login page
if (!account) {
return;
}

if (!isOnboardingComplete(account)) {
setScreen({
id: "onboarding",
account,
});
} else {
onComplete();
}
}

// eslint-disable-next-line no-restricted-syntax
useEffect(() => {
// if suddenly disconnected
if (connectionStatus !== "connected" && screen.id !== "login") {
setScreen({ id: "login" });
Copy link
Member

@joaquim-verges joaquim-verges Jan 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this safe?

Copy link
Member Author

@MananTank MananTank Jan 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah - just making sure that you are never setting an onboarding screen if wallet is disconnected - login screen is the initial ConnectEmbed UI

}
}, [connectionStatus, screen.id]);

if (connectionStatus === "connecting") {
return <LoadingCard />;
}
Expand All @@ -170,29 +196,14 @@ function PageContent(props: {
onComplete={onComplete}
redirectPath={props.redirectPath}
redirectToCheckout={redirectToCheckout}
onLogout={() => {
setScreen({ id: "login" });
}}
/>
</Suspense>
);
}

async function onLogin() {
const account = await getRawAccountAction();

// shouldn't happen - but if account is not found, stay on login page
if (!account) {
return;
}

if (!isOnboardingComplete(account)) {
setScreen({
id: "onboarding",
account,
});
} else {
onComplete();
}
}

return <LoadingCard />;
}

Expand Down
3 changes: 3 additions & 0 deletions apps/dashboard/src/app/login/onboarding/General.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,22 @@ type OnboardingGeneralProps = {
account: Account;
onSave: (email: string) => void;
onDuplicate: (email: string) => void;
onLogout: () => void;
};

export const OnboardingGeneral: React.FC<OnboardingGeneralProps> = ({
account,
onSave,
onDuplicate,
onLogout,
}) => {
const [existing, setExisting] = useState(false);
const activeWallet = useActiveWallet();
const { disconnect } = useDisconnect();

async function handleLogout() {
await doLogout();
onLogout();
if (activeWallet) {
disconnect(activeWallet);
}
Expand Down
2 changes: 2 additions & 0 deletions apps/dashboard/src/app/login/onboarding/on-boarding-ui.client.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ type OnboardingScreen =
function OnboardingUI(props: {
account: Account;
onComplete: () => void;
onLogout: () => void;
// path to redirect from stripe
redirectPath: string;
redirectToCheckout: RedirectBillingCheckoutAction;
Expand Down Expand Up @@ -68,6 +69,7 @@ function OnboardingUI(props: {
{screen.id === "onboarding" && (
<OnboardingGeneral
account={account}
onLogout={props.onLogout}
onSave={(email) => {
setUpdatedEmail(email);
setScreen({
Expand Down
Loading