diff --git a/src/assets/icons/save.svg b/src/assets/icons/save.svg new file mode 100644 index 0000000..c63233f --- /dev/null +++ b/src/assets/icons/save.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/upload.svg b/src/assets/icons/upload.svg new file mode 100644 index 0000000..79cafb5 --- /dev/null +++ b/src/assets/icons/upload.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/components/OnboardWarning.tsx b/src/components/OnboardWarning.tsx index a8b45ed..1137278 100644 --- a/src/components/OnboardWarning.tsx +++ b/src/components/OnboardWarning.tsx @@ -1,7 +1,10 @@ import { Show, createSignal, onMount } from "solid-js"; -import { Button, ButtonLink, SmallHeader, VStack } from "./layout"; +import { Button, ButtonLink, SmallHeader } from "./layout"; import { useMegaStore } from "~/state/megaStore"; import { showToast } from "./Toaster"; +import save from "~/assets/icons/save.svg" +import close from "~/assets/icons/close.svg"; +import restore from "~/assets/icons/upload.svg"; export function OnboardWarning() { const [state, actions] = useMegaStore(); @@ -18,30 +21,44 @@ export function OnboardWarning() { return ( <> {/* TODO: show this once we have a restore flow */} - -
- Welcome! - -

- Do you want to restore an existing Mutiny Wallet? -

-
- - + +
+
+ backup +
+
+
+ Welcome! +

+ If you've used Mutiny before you can restore from a backup. Otherwise you can skip this and enjoy your new wallet! +

- + + +
+
-
- Secure your funds -

- You have money stored in this browser. Let's make sure you have a backup. -

-
- Backup - +
+
+ backup
+
+
+ Secure your funds +

+ You have money stored in this browser. Let's make sure you have a backup. +

+
+ Backup + +
+
diff --git a/src/components/layout/Button.tsx b/src/components/layout/Button.tsx index 32744c5..3bbc2cb 100644 --- a/src/components/layout/Button.tsx +++ b/src/components/layout/Button.tsx @@ -4,7 +4,7 @@ import { Dynamic } from "solid-js/web"; import { A } from "solid-start"; import { LoadingSpinner } from "."; -const button = cva("p-3 rounded-xl text-xl font-semibold disabled:opacity-50 disabled:grayscale transition", { +const button = cva("p-3 rounded-xl font-semibold disabled:opacity-50 disabled:grayscale transition", { variants: { // TODO: button hover has to work different than buttonlinks (like disabled state) intent: { @@ -16,10 +16,10 @@ const button = cva("p-3 rounded-xl text-xl font-semibold disabled:opacity-50 dis green: "bg-m-green text-white shadow-inner-button hover:bg-m-green-dark text-shadow-button", }, layout: { - flex: "flex-1", - pad: "px-8", + flex: "flex-1 text-xl", + pad: "px-8 text-xl", small: "px-4 py-2 w-auto text-lg", - xs: "px-2 py-1 w-auto rounded-lg font-normal text-base" + xs: "px-4 py-2 w-auto rounded-lg text-base" }, }, defaultVariants: { diff --git a/src/routes/Storybook.tsx b/src/routes/Storybook.tsx index 9a6ce43..f33f0e9 100644 --- a/src/routes/Storybook.tsx +++ b/src/routes/Storybook.tsx @@ -1,6 +1,7 @@ import { ActivityItem } from "~/components/ActivityItem"; import { AmountCard } from "~/components/AmountCard"; import NavBar from "~/components/NavBar"; +import { OnboardWarning } from "~/components/OnboardWarning"; import { ShareCard } from "~/components/ShareCard"; import { Card, DefaultMain, LargeHeader, SafeArea, VStack } from "~/components/layout"; @@ -10,14 +11,15 @@ export default function Admin() { Storybook + - - - - + + + +