chore: reorder and use wallet name from lud16

animations/Paid.tsx → animations/Tick.tsx

@@ -1,6 +1,6 @@
 import LottieView from "lottie-react-native";
 
-export function Paid() {
+export function Tick() {
   return (
     <LottieView
       autoPlay

app/(app)/_layout.tsx

@@ -7,8 +7,7 @@ import { useRouteInfo } from 'expo-router/build/hooks';
 export default function AppLayout() {
     const { hasSession } = useSession();
     const isOnboarded = useAppStore(store => store.isOnboarded);
-    const nwcClient = useAppStore(store => store.nwcClient);
-    const selectedWalletId = useAppStore((store) => store.selectedWalletId);
+    const wallets = useAppStore(store => store.wallets);
     const route = useRouteInfo();
     useHandleLinking();
 
@@ -22,10 +21,10 @@ export default function AppLayout() {
         return <Redirect href="/unlock" />;
     }
 
-    const connectionPage = `/settings/wallets/${selectedWalletId}/wallet-connection`;
+    const connectionPage = "/settings/wallets/setup";
     // Check the current pathname to prevent redirect loops
-    if (!nwcClient && route.pathname !== connectionPage) {
-        console.log("No NWC client available, redirecting to wallet setup");
+    if (!wallets.length && route.pathname !== connectionPage) {
+        console.log("No wallets available, redirecting to setup");
         return <Redirect href={connectionPage} />;
     }
 

app/(app)/settings/wallets/setup.js

@@ -0,0 +1,5 @@
+import { SetupWallet } from "../../../../pages/settings/wallets/SetupWallet";
+
+export default function Page() {
+  return <SetupWallet />;
+}

components/Icons.tsx

@@ -39,7 +39,7 @@ import {
   CircleCheck,
   TriangleAlert,
   LogOut,
-  ArchiveRestore
+  ArchiveRestore,
 } from "lucide-react-native";
 import { cssInterop } from "nativewind";
 

components/ToastConfig.tsx

@@ -16,6 +16,15 @@ export const toastConfig: ToastConfig = {
       {text2 && <Text className="text-background text-center">{text2}</Text>}
     </View>
   ),
+  info: ({ text1, text2, hide }) => (
+    <View className="bg-yellow-500 rounded-full px-6 py-3 mx-6">
+      <View className="flex flex-row gap-2 justify-center items-center">
+        <XCircle className="text-background" width={16} height={16} />
+        <Text className="text-background font-semibold2">{text1}</Text>
+      </View>
+      {text2 && <Text className="text-background text-center">{text2}</Text>}
+    </View>
+  ),
   error: ({ text1, text2, hide }) => (
     <View className="bg-destructive rounded-xl px-6 py-3 mx-6">
       <View className="flex flex-row gap-2 justify-center items-center">

lib/state/appStore.ts

@@ -15,8 +15,6 @@ interface AppState {
   setUnlocked: (unlocked: boolean) => void;
   setOnboarded: (isOnboarded: boolean) => void;
   setNWCClient: (nwcClient: NWCClient | undefined) => void;
-  setNostrWalletConnectUrl(nostrWalletConnectUrl: string): void;
-  removeNostrWalletConnectUrl(): void;
   updateCurrentWallet(wallet: Partial<Wallet>): void;
   removeCurrentWallet(): void;
   setFiatCurrency(fiatCurrency: string): void;
@@ -67,9 +65,6 @@ function loadWallets(): Wallet[] {
     }
     wallets.push(JSON.parse(walletJSON));
   }
-  if (!wallets.length) {
-    wallets.push({});
-  }
   return wallets;
 }
 
@@ -111,13 +106,13 @@ export const useAppStore = create<AppState>()((set, get) => {
     if (wallets.length <= 1) {
       // set to initial wallet status
       secureStorage.removeItem(hasOnboardedKey);
+      secureStorage.removeItem(getWalletKey(0));
       secureStorage.setItem(selectedWalletIdKey, "0");
-      secureStorage.setItem(getWalletKey(0), JSON.stringify({}));
       set({
-        nwcClient: undefined,
-        selectedWalletId: 0,
-        wallets: [{}],
         isOnboarded: false,
+        wallets: [],
+        selectedWalletId: 0,
+        nwcClient: undefined,
       });
       return;
     }
@@ -171,18 +166,6 @@ export const useAppStore = create<AppState>()((set, get) => {
       set({ isOnboarded });
     },
     setNWCClient: (nwcClient) => set({ nwcClient }),
-    removeNostrWalletConnectUrl: () => {
-      updateCurrentWallet({
-        nostrWalletConnectUrl: undefined,
-      });
-
-      set({ nwcClient: undefined });
-    },
-    setNostrWalletConnectUrl: (nostrWalletConnectUrl) => {
-      updateCurrentWallet({
-        nostrWalletConnectUrl,
-      });
-    },
     setSecurityEnabled: (isEnabled) => {
       secureStorage.setItem(isSecurityEnabledKey, isEnabled.toString());
       set({
@@ -208,7 +191,6 @@ export const useAppStore = create<AppState>()((set, get) => {
       set({
         wallets: [...currentWallets, wallet],
         selectedWalletId: newWalletId,
-        nwcClient: undefined,
       });
     },
     addAddressBookEntry: (addressBookEntry: AddressBookEntry) => {
@@ -256,13 +238,12 @@ export const useAppStore = create<AppState>()((set, get) => {
 
       // set to initial wallet status
       secureStorage.setItem(selectedWalletIdKey, "0");
-      secureStorage.setItem(getWalletKey(0), JSON.stringify({}));
 
       set({
         nwcClient: undefined,
         fiatCurrency: undefined,
         selectedWalletId: 0,
-        wallets: [{}],
+        wallets: [],
         addressBookEntries: [],
         isSecurityEnabled: false,
         isOnboarded: false,

pages/Home.tsx

@@ -1,7 +1,6 @@
 import { View, Pressable, StyleSheet, TouchableOpacity } from "react-native";
 import React, { useState } from "react";
 import { useBalance } from "hooks/useBalance";
-import { useAppStore } from "lib/state/appStore";
 import {
   Link, useFocusEffect
 } from "expo-router";
@@ -29,8 +28,6 @@ enum BalanceState {
 }
 
 export function Home() {
-  const selectedWalletId = useAppStore((store) => store.selectedWalletId);
-  const nwcClient = useAppStore((store) => store.nwcClient);
   const { data: balance, mutate: reloadBalance } = useBalance();
   const getFiatAmount = useGetFiatAmount();
   const [balanceState, setBalanceState] = useState<BalanceState>(

pages/receive/ReceiveSuccess.tsx

@@ -1,7 +1,7 @@
 import { Invoice } from "@getalby/lightning-tools";
 import { router, useLocalSearchParams } from "expo-router";
 import { ScrollView, View } from "react-native";
-import { Paid } from "~/animations/Paid";
+import { Tick } from "~/animations/Tick";
 import Screen from "~/components/Screen";
 import { Button } from "~/components/ui/button";
 import { Text } from "~/components/ui/text";
@@ -21,7 +21,7 @@ export function ReceiveSuccess() {
       />
       <ScrollView contentContainerClassName="flex justify-center items-center gap-8 p-6">
         <View className="flex-1 w-full">
-          <Paid />
+          <Tick />
         </View>
         <Text className="text-3xl font-bold2 text-muted-foreground">
           Received

pages/send/PaymentSuccess.tsx

@@ -1,6 +1,6 @@
 import { router, useLocalSearchParams } from "expo-router";
 import { ScrollView, View } from "react-native";
-import { Paid } from "~/animations/Paid";
+import { Tick } from "~/animations/Tick";
 import { Button } from "~/components/ui/button";
 import { Text } from "~/components/ui/text";
 import Screen from "~/components/Screen";
@@ -28,7 +28,7 @@ export function PaymentSuccess() {
       />
       <ScrollView contentContainerClassName="flex justify-center items-center gap-8 p-6">
         <View className="flex-1 w-full">
-          <Paid />
+          <Tick />
         </View>
         <View className="flex flex-col items-center gap-2">
           <View className="flex flex-row items-end justify-center">

pages/settings/Settings.tsx

@@ -29,7 +29,7 @@ export function Settings() {
           <TouchableOpacity className="flex flex-row items-center gap-4">
             <Wallet2 className="text-foreground" />
             <Text className="font-medium2 text-xl text-foreground">Wallets</Text>
-            <Text className="text-muted-foreground text-xl">
+            <Text className="text-muted-foreground text-xl flex-shrink" numberOfLines={1} ellipsizeMode="tail">
               ({wallet.name || DEFAULT_WALLET_NAME})
             </Text>
           </TouchableOpacity>

pages/settings/Wallets.tsx

@@ -46,9 +46,9 @@ export function Wallets() {
                     active ? "border-primary" : "border-transparent",
                   )}
                 >
-                  <View className="flex flex-row gap-4 items-center">
+                  <View className="flex flex-row gap-4 items-center flex-shrink">
                     <Wallet2 className="text-foreground" />
-                    <Text className={cn("text-xl", active && "font-semibold2")}>
+                    <Text className={cn("text-xl pr-16", active && "font-semibold2")} numberOfLines={1} ellipsizeMode="tail">
                       {item.item.name || DEFAULT_WALLET_NAME}
                     </Text>
                   </View>
@@ -69,11 +69,15 @@ export function Wallets() {
           />
         </View>
         <View className="p-6">
-          <Link href="/settings/wallets/new" asChild>
-            <Button size="lg">
-              <Text>Connect a Wallet</Text>
-            </Button>
-          </Link>
+          <Button
+            size="lg"
+            onPress={() => {
+              router.dismissAll();
+              router.push("/settings/wallets/setup");
+            }}
+          >
+            <Text>Connect a Wallet</Text>
+          </Button>
         </View>
       </View>
     </>