diff --git a/apps/abstraxion-dashboard/components/Abstraxion/index.tsx b/apps/abstraxion-dashboard/components/Abstraxion/index.tsx index 80115931..36324b05 100644 --- a/apps/abstraxion-dashboard/components/Abstraxion/index.tsx +++ b/apps/abstraxion-dashboard/components/Abstraxion/index.tsx @@ -16,6 +16,7 @@ import { AbstraxionWallets } from "@/components/AbstraxionWallets"; import { ErrorDisplay } from "@/components/ErrorDisplay"; import { useSearchParams } from "next/navigation"; import { AbstraxionGrant } from "../AbstraxionGrant"; +import Image from "next/image"; export interface ModalProps { onClose: VoidFunction; @@ -52,21 +53,46 @@ export const Abstraxion = ({ isOpen, onClose }: ModalProps) => { if (!isOpen) return null; return ( - - - {abstraxionError ? ( - - ) : isConnecting || isReconnecting ? ( - - ) : account?.bech32Address && contracts && grantee ? ( - - ) : isConnected ? ( - - ) : ( - - )} - - + <> + + + {abstraxionError ? ( + + ) : isConnecting || isReconnecting ? ( + + ) : account?.bech32Address && contracts && grantee ? ( + + ) : isConnected ? ( + + ) : ( + + )} + + + {/* TOS Footer */} + {!isConnected && ( +
+
+ + By continuing, you agree to and acknowledge that you have read and + understand the + + + Disclaimer + + . +
+
+

+ Powered by +

+ + Xion Logo + +
+
+ )} + ); }; diff --git a/apps/abstraxion-dashboard/components/AbstraxionSignin/index.tsx b/apps/abstraxion-dashboard/components/AbstraxionSignin/index.tsx index c9fa8636..93ec2c2e 100644 --- a/apps/abstraxion-dashboard/components/AbstraxionSignin/index.tsx +++ b/apps/abstraxion-dashboard/components/AbstraxionSignin/index.tsx @@ -90,10 +90,10 @@ export const AbstraxionSignin = () => { {isOnOtpStep ? ( <>
-

+

Input 6 digit code

-

+

Please check your email for the verification code

@@ -119,11 +119,11 @@ export const AbstraxionSignin = () => { ) : ( <> -
-

+
+

Welcome

-

+

Log in or sign up with your email

@@ -141,23 +141,6 @@ export const AbstraxionSignin = () => { > Log in / Sign up -

- By continuing, you agree to Burnt's{" "} - - Terms of Service - {" "} - and acknowledge that you have read and understand the XION{" "} - - Disclaimer - - . -

)} diff --git a/apps/abstraxion-dashboard/components/AbstraxionWallets/index.tsx b/apps/abstraxion-dashboard/components/AbstraxionWallets/index.tsx index 5589f827..e40fbf49 100644 --- a/apps/abstraxion-dashboard/components/AbstraxionWallets/index.tsx +++ b/apps/abstraxion-dashboard/components/AbstraxionWallets/index.tsx @@ -12,6 +12,7 @@ import { AllSmartWalletQuery } from "@/utils/queries"; import { truncateAddress } from "@/utils"; import { useAbstraxionAccount } from "@/hooks"; import { Loading } from "../Loading"; +import { WalletIcon } from "../Icons"; export const AbstraxionWallets = () => { const { @@ -122,10 +123,10 @@ export const AbstraxionWallets = () => { ) : (
-

+

Welcome

-

+

Select an account to continue

@@ -141,29 +142,31 @@ export const AbstraxionWallets = () => {
) : (
-
Accounts
-
+
+ Accounts +
+
{loading || fetchingNewWallets ? ( ) : data?.smartAccounts.nodes.length >= 1 ? ( data?.smartAccounts?.nodes?.map((node: any, i: number) => (
setAbstractAccount({ ...node, userId: user?.user_id }) } > - +
-

+

Personal Account {i + 1}

-

+

{truncateAddress(node.id)}

diff --git a/apps/abstraxion-dashboard/components/Icons/Wallet.tsx b/apps/abstraxion-dashboard/components/Icons/Wallet.tsx index 4c3ac533..861546ff 100644 --- a/apps/abstraxion-dashboard/components/Icons/Wallet.tsx +++ b/apps/abstraxion-dashboard/components/Icons/Wallet.tsx @@ -1,9 +1,11 @@ export const WalletIcon = ({ color, backgroundColor, + outlineColor, }: { color: string; backgroundColor: string; + outlineColor?: string; }) => ( diff --git a/packages/ui/src/assets/fonts/AkkuratLLWeb-Black.woff b/packages/ui/src/assets/fonts/AkkuratLLWeb-Black.woff new file mode 100644 index 00000000..0d002311 Binary files /dev/null and b/packages/ui/src/assets/fonts/AkkuratLLWeb-Black.woff differ diff --git a/packages/ui/src/assets/fonts/AkkuratLLWeb-Black.woff2 b/packages/ui/src/assets/fonts/AkkuratLLWeb-Black.woff2 new file mode 100644 index 00000000..a261853d Binary files /dev/null and b/packages/ui/src/assets/fonts/AkkuratLLWeb-Black.woff2 differ diff --git a/packages/ui/src/assets/fonts/AkkuratLLWeb-BlackItalic.woff b/packages/ui/src/assets/fonts/AkkuratLLWeb-BlackItalic.woff new file mode 100644 index 00000000..af9a67fe Binary files /dev/null and b/packages/ui/src/assets/fonts/AkkuratLLWeb-BlackItalic.woff differ diff --git a/packages/ui/src/assets/fonts/AkkuratLLWeb-BlackItalic.woff2 b/packages/ui/src/assets/fonts/AkkuratLLWeb-BlackItalic.woff2 new file mode 100644 index 00000000..9e55f640 Binary files /dev/null and b/packages/ui/src/assets/fonts/AkkuratLLWeb-BlackItalic.woff2 differ diff --git a/packages/ui/src/assets/fonts/AkkuratLLWeb-Bold.woff b/packages/ui/src/assets/fonts/AkkuratLLWeb-Bold.woff new file mode 100644 index 00000000..47dcd6d0 Binary files /dev/null and b/packages/ui/src/assets/fonts/AkkuratLLWeb-Bold.woff differ diff --git a/packages/ui/src/assets/fonts/AkkuratLLWeb-Bold.woff2 b/packages/ui/src/assets/fonts/AkkuratLLWeb-Bold.woff2 new file mode 100644 index 00000000..d81fdd60 Binary files /dev/null and b/packages/ui/src/assets/fonts/AkkuratLLWeb-Bold.woff2 differ diff --git a/packages/ui/src/assets/fonts/AkkuratLLWeb-BoldItalic.woff b/packages/ui/src/assets/fonts/AkkuratLLWeb-BoldItalic.woff new file mode 100644 index 00000000..bd9d5835 Binary files /dev/null and b/packages/ui/src/assets/fonts/AkkuratLLWeb-BoldItalic.woff differ diff --git a/packages/ui/src/assets/fonts/AkkuratLLWeb-BoldItalic.woff2 b/packages/ui/src/assets/fonts/AkkuratLLWeb-BoldItalic.woff2 new file mode 100644 index 00000000..af942c50 Binary files /dev/null and b/packages/ui/src/assets/fonts/AkkuratLLWeb-BoldItalic.woff2 differ diff --git a/packages/ui/src/assets/fonts/AkkuratLLWeb-Italic.woff b/packages/ui/src/assets/fonts/AkkuratLLWeb-Italic.woff new file mode 100644 index 00000000..f16ee04e Binary files /dev/null and b/packages/ui/src/assets/fonts/AkkuratLLWeb-Italic.woff differ diff --git a/packages/ui/src/assets/fonts/AkkuratLLWeb-Italic.woff2 b/packages/ui/src/assets/fonts/AkkuratLLWeb-Italic.woff2 new file mode 100644 index 00000000..eef7c973 Binary files /dev/null and b/packages/ui/src/assets/fonts/AkkuratLLWeb-Italic.woff2 differ diff --git a/packages/ui/src/assets/fonts/AkkuratLLWeb-Light.woff b/packages/ui/src/assets/fonts/AkkuratLLWeb-Light.woff new file mode 100644 index 00000000..e6d128aa Binary files /dev/null and b/packages/ui/src/assets/fonts/AkkuratLLWeb-Light.woff differ diff --git a/packages/ui/src/assets/fonts/AkkuratLLWeb-Light.woff2 b/packages/ui/src/assets/fonts/AkkuratLLWeb-Light.woff2 new file mode 100644 index 00000000..f96503e0 Binary files /dev/null and b/packages/ui/src/assets/fonts/AkkuratLLWeb-Light.woff2 differ diff --git a/packages/ui/src/assets/fonts/AkkuratLLWeb-LightItalic.woff b/packages/ui/src/assets/fonts/AkkuratLLWeb-LightItalic.woff new file mode 100644 index 00000000..e57ff531 Binary files /dev/null and b/packages/ui/src/assets/fonts/AkkuratLLWeb-LightItalic.woff differ diff --git a/packages/ui/src/assets/fonts/AkkuratLLWeb-LightItalic.woff2 b/packages/ui/src/assets/fonts/AkkuratLLWeb-LightItalic.woff2 new file mode 100644 index 00000000..6615c0e1 Binary files /dev/null and b/packages/ui/src/assets/fonts/AkkuratLLWeb-LightItalic.woff2 differ diff --git a/packages/ui/src/assets/fonts/AkkuratLLWeb-Regular.woff b/packages/ui/src/assets/fonts/AkkuratLLWeb-Regular.woff new file mode 100644 index 00000000..46351efb Binary files /dev/null and b/packages/ui/src/assets/fonts/AkkuratLLWeb-Regular.woff differ diff --git a/packages/ui/src/assets/fonts/AkkuratLLWeb-Regular.woff2 b/packages/ui/src/assets/fonts/AkkuratLLWeb-Regular.woff2 new file mode 100644 index 00000000..1830321d Binary files /dev/null and b/packages/ui/src/assets/fonts/AkkuratLLWeb-Regular.woff2 differ diff --git a/packages/ui/src/assets/fonts/AkkuratLLWeb-Thin.woff b/packages/ui/src/assets/fonts/AkkuratLLWeb-Thin.woff new file mode 100644 index 00000000..20f18bc5 Binary files /dev/null and b/packages/ui/src/assets/fonts/AkkuratLLWeb-Thin.woff differ diff --git a/packages/ui/src/assets/fonts/AkkuratLLWeb-Thin.woff2 b/packages/ui/src/assets/fonts/AkkuratLLWeb-Thin.woff2 new file mode 100644 index 00000000..8ae41429 Binary files /dev/null and b/packages/ui/src/assets/fonts/AkkuratLLWeb-Thin.woff2 differ diff --git a/packages/ui/src/assets/fonts/AkkuratLLWeb-ThinItalic.woff b/packages/ui/src/assets/fonts/AkkuratLLWeb-ThinItalic.woff new file mode 100644 index 00000000..c0022db9 Binary files /dev/null and b/packages/ui/src/assets/fonts/AkkuratLLWeb-ThinItalic.woff differ diff --git a/packages/ui/src/assets/fonts/AkkuratLLWeb-ThinItalic.woff2 b/packages/ui/src/assets/fonts/AkkuratLLWeb-ThinItalic.woff2 new file mode 100644 index 00000000..783da3de Binary files /dev/null and b/packages/ui/src/assets/fonts/AkkuratLLWeb-ThinItalic.woff2 differ diff --git a/packages/ui/src/button.tsx b/packages/ui/src/button.tsx index 23a73789..64b25534 100644 --- a/packages/ui/src/button.tsx +++ b/packages/ui/src/button.tsx @@ -41,7 +41,7 @@ export const Button: React.FC = ({ return (
{children} @@ -46,32 +46,36 @@ const DialogContent = React.forwardRef< )); DialogContent.displayName = DialogPrimitive.Content.displayName; -const DialogHeader = ({ +function DialogHeader({ className, ...props -}: React.HTMLAttributes) => ( -
-); +}: React.HTMLAttributes) { + return ( +
+ ); +} DialogHeader.displayName = "DialogHeader"; -const DialogFooter = ({ +function DialogFooter({ className, ...props -}: React.HTMLAttributes) => ( -
-); +}: React.HTMLAttributes) { + return ( +
+ ); +} DialogFooter.displayName = "DialogFooter"; const DialogTitle = React.forwardRef< @@ -79,11 +83,11 @@ const DialogTitle = React.forwardRef< React.ComponentPropsWithoutRef >(({ className, ...props }, ref) => ( )); @@ -94,8 +98,8 @@ const DialogDescription = React.forwardRef< React.ComponentPropsWithoutRef >(({ className, ...props }, ref) => ( )); diff --git a/packages/ui/src/input.tsx b/packages/ui/src/input.tsx index 698d8de3..b797444f 100644 --- a/packages/ui/src/input.tsx +++ b/packages/ui/src/input.tsx @@ -1,4 +1,5 @@ -import { InputHTMLAttributes, useState } from "react"; +import type { InputHTMLAttributes } from "react"; +import { useState } from "react"; type BaseInputProps = Omit, "prefix">; @@ -35,20 +36,22 @@ export function Input({

) : null}
); diff --git a/packages/ui/src/styles.css b/packages/ui/src/styles.css index b5c61c95..6fe3fd91 100644 --- a/packages/ui/src/styles.css +++ b/packages/ui/src/styles.css @@ -1,3 +1,84 @@ @tailwind base; @tailwind components; @tailwind utilities; + +@font-face { + font-family: 'Akkurat'; + src: url('./assets/fonts/AkkuratLLWeb-Thin.woff2') format('woff2'), + url('./assets/fonts/AkkuratLLWeb-Thin.woff') format('woff'); + font-weight: 100; + font-style: normal; + } + + @font-face { + font-family: 'Akkurat'; + src: url('./assets/fonts/AkkuratLLWeb-ThinItalic.woff2') format('woff2'), + url('./assets/fonts/AkkuratLLWeb-ThinItalic.woff') format('woff'); + font-weight: 100; + font-style: italic; + } + + @font-face { + font-family: 'Akkurat'; + src: url('./assets/fonts/AkkuratLLWeb-Light.woff2') format('woff2'), + url('./assets/fonts/AkkuratLLWeb-Light.woff') format('woff'); + font-weight: 300; + font-style: normal; + } + + @font-face { + font-family: 'Akkurat'; + src: url('./assets/fonts/AkkuratLLWeb-LightItalic.woff2') format('woff2'), + url('./assets/fonts/AkkuratLLWeb-LightItalic.woff') format('woff'); + font-weight: 300; + font-style: italic; + } + + @font-face { + font-family: 'Akkurat'; + src: url('./assets/fonts/AkkuratLLWeb-Regular.woff2') format('woff2'), + url('./assets/fonts/AkkuratLLWeb-Regular.woff') format('woff'); + font-weight: 400; + font-style: normal; + } + + @font-face { + font-family: 'Akkurat'; + src: url('./assets/fonts/AkkuratLLWeb-Italic.woff2') format('woff2'), + url('./assets/fonts/AkkuratLLWeb-Italic.woff') format('woff'); + font-weight: 400; + font-style: italic; + } + + @font-face { + font-family: 'Akkurat'; + src: url('./assets/fonts/AkkuratLLWeb-Bold.woff2') format('woff2'), + url('./assets/fonts/AkkuratLLWeb-Bold.woff') format('woff'); + font-weight: 700; + font-style: normal; + } + + @font-face { + font-family: 'Akkurat'; + src: url('./assets/fonts/AkkuratLLWeb-BoldItalic.woff2') format('woff2'), + url('./assets/fonts/AkkuratLLWeb-BoldItalic.woff') format('woff'); + font-weight: 700; + font-style: italic; + } + + @font-face { + font-family: 'Akkurat'; + src: url('./assets/fonts/AkkuratLLWeb-Black.woff2') format('woff2'), + url('./assets/fonts/AkkuratLLWeb-Black.woff') format('woff'); + font-weight: 900; + font-style: normal; + } + + @font-face { + font-family: 'Akkurat'; + src: url('./assets/fonts/AkkuratLLWeb-BlackItalic.woff2') format('woff2'), + url('./assets/fonts/AkkuratLLWeb-BlackItalic.woff') format('woff'); + font-weight: 900; + font-style: italic; + } + diff --git a/packages/ui/tailwind.config.ts b/packages/ui/tailwind.config.ts index f5d25806..fd34ff9d 100644 --- a/packages/ui/tailwind.config.ts +++ b/packages/ui/tailwind.config.ts @@ -1,12 +1,12 @@ // tailwind config is required for editor support +import fs from "node:fs"; import type { Config } from "tailwindcss"; import sharedConfig from "@burnt-labs/tailwind-config/tailwind.config.ts"; -import fs from "fs"; // Convert image to base64 const imageToBase64 = (path: string): string => { const bitmap = fs.readFileSync(path); - return "data:image/png;base64," + Buffer.from(bitmap).toString("base64"); + return `data:image/png;base64,${Buffer.from(bitmap).toString("base64")}`; }; const config: Pick = { @@ -19,6 +19,9 @@ const config: Pick = { "./src/assets/xion-bg-blur.png", )}')`, }, + fontFamily: { + akkuratLL: ["Akkurat", "sans-serif"], + }, }, }, };