Skip to content

Commit

Permalink
Merge branch '940-feature-request-incorporate-team-or-professional-se…
Browse files Browse the repository at this point in the history
…lection-on-user-create-flow' into dev
  • Loading branch information
DonKoko committed May 15, 2024
2 parents b54808b + 9fc6faf commit 48d3a7f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
1 change: 0 additions & 1 deletion app/components/subscription/price-box.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ export const PriceBox = ({

const { shelf_tier } = price.product.metadata;

console.log(shelf_tier);
return (
<div
className={tw(
Expand Down
9 changes: 3 additions & 6 deletions app/routes/_welcome+/onboarding.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -168,12 +168,9 @@ export async function action({ context, request }: ActionFunctionArgs) {
);
}

return redirect(
`/welcome${organizationId ? `?organizationId=${organizationId}` : ""}`,
{
headers,
}
);
return redirect(organizationId ? `/assets` : `/welcome`, {
headers,
});
} catch (cause) {
const reason = makeShelfError(cause, { userId });
return json(error(reason), { status: reason.status });
Expand Down

0 comments on commit 48d3a7f

Please sign in to comment.