diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 5673ee30..a7b43f77 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -8,7 +8,7 @@ on: env: # Dummy variables for tests/builds that might expect them - DATABASE_URL: postgresql://lance:lance@localhost:5432/lance + DATABASE_URL: postgresql://postgres:postgres@localhost:5432/postgres NEXT_PUBLIC_E2E: "true" JUDGE_AUTHORITY_SECRET: SBU6F23AV5T5E6AXK2J5C6A6C6A6C6A6C6A6C6A6C6A6C6A6C6A6C6A6 ESCROW_CONTRACT_ID: CD5E6AXK2J5C6A6C6A6C6A6C6A6C6A6C6A6C6A6C6A6C6A6C6A6C6A6C6A6 @@ -25,9 +25,9 @@ jobs: postgres: image: postgres:15 env: - POSTGRES_USER: lance - POSTGRES_PASSWORD: lance - POSTGRES_DB: lance + POSTGRES_USER: postgres + POSTGRES_PASSWORD: postgres + POSTGRES_DB: postgres ports: - 5432:5432 options: >- diff --git a/Cargo.toml b/Cargo.toml index 232af8d2..5a5e88f6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,6 +26,7 @@ thiserror = "1" dotenvy = "0.15" tower = "0.4" tower-http = { version = "0.5", features = ["cors", "trace"] } +hex = "0.4" [profile.release] opt-level = "z" @@ -35,4 +36,4 @@ strip = "symbols" debug-assertions = false panic = "abort" codegen-units = 1 -lto = true +lto = true \ No newline at end of file diff --git a/apps/web/components/navigation/top-nav.tsx b/apps/web/components/navigation/top-nav.tsx index ee220682..2cac3826 100644 --- a/apps/web/components/navigation/top-nav.tsx +++ b/apps/web/components/navigation/top-nav.tsx @@ -137,7 +137,7 @@ export function TopNav({ onOpenSidebar }: { onOpenSidebar?: () => void }) { )} {networkMismatch ? ( - + ) : null} @@ -171,9 +171,9 @@ export function TopNav({ onOpenSidebar }: { onOpenSidebar?: () => void }) { )} {networkMismatch ? ( - + - {walletNetwork} vs {appNetwork} + Network Mismatch ) : null} {error ? ( @@ -193,7 +193,7 @@ export function TopNav({ onOpenSidebar }: { onOpenSidebar?: () => void }) { {user?.name ?.split(" ") - .map((part) => part[0]) + .map((part: string) => part[0]) .join("") .slice(0, 2) ?? "LN"} diff --git a/apps/web/components/ui/network-mismatch-banner.tsx b/apps/web/components/ui/network-mismatch-banner.tsx index 143adc68..b8997bdb 100644 --- a/apps/web/components/ui/network-mismatch-banner.tsx +++ b/apps/web/components/ui/network-mismatch-banner.tsx @@ -1,25 +1,61 @@ "use client"; -import { AlertTriangle } from "lucide-react"; -import { useAuthStore } from "@/lib/store/use-auth-store"; +import { TriangleAlert, ArrowRightLeft, X } from "lucide-react"; +import { useWalletStore } from "@/lib/store/use-wallet-store"; +import { APP_STELLAR_NETWORK } from "@/lib/stellar"; +import { cn } from "@/lib/utils"; export function NetworkMismatchBanner() { - const networkMismatch = useAuthStore((state) => state.networkMismatch); + const { networkMismatch, setNetworkMismatch } = useWalletStore(); if (!networkMismatch) return null; return ( -
-