Merge remote-tracking branch 'origin/master' into chore/bump-expo-ver…

…sion
getAlby · Dec 6, 2024 · 7505837 · 7505837
2 parents cdda0d9 + fce4ebc
commit 7505837
Show file tree

Hide file tree

Showing 11 changed files with 131 additions and 64 deletions.
diff --git a/app.json b/app.json
@@ -2,7 +2,7 @@
   "expo": {
     "name": "Alby Go",
     "slug": "alby-mobile",
-    "version": "1.7.1",
+    "version": "1.7.2",
     "scheme": ["lightning", "bitcoin", "alby"],
     "orientation": "portrait",
     "icon": "./assets/icon.png",

diff --git a/components/Icons.tsx b/components/Icons.tsx
@@ -34,7 +34,9 @@ import {
   RefreshCw,
   Settings2,
   Share2,
+  Trash2,
   TriangleAlert,
+  UserCircle2,
   Wallet2,
   WalletIcon,
   X,
@@ -95,6 +97,8 @@ interopIcon(CircleCheck);
 interopIcon(TriangleAlert);
 interopIcon(LogOut);
 interopIcon(ArchiveRestore);
+interopIcon(UserCircle2);
+interopIcon(Trash2);
 
 export {
   AlertCircle,
@@ -131,7 +135,9 @@ export {
   RefreshCw,
   Settings2,
   Share2,
+  Trash2,
   TriangleAlert,
+  UserCircle2,
   Wallet2,
   WalletIcon,
   X,

diff --git a/components/QRCode.tsx b/components/QRCode.tsx
@@ -12,7 +12,7 @@ function QRCode({ value }: { value: string }) {
       style={{ borderRadius: 28, elevation: 2 }}
     >
       <View className="flex items-center justify-center p-3 rounded-3xl bg-white w-96 h-96">
-        <QRCodeLibrary value={value} size={300} />
+        <QRCodeLibrary value={value} size={300} ecl="H" />
       </View>
     </LinearGradient>
   );

diff --git a/components/QRCodeScanner.tsx b/components/QRCodeScanner.tsx
@@ -1,3 +1,4 @@
+import { useIsFocused } from "@react-navigation/native";
 import { Camera } from "expo-camera";
 import { PermissionStatus } from "expo-modules-core/src/PermissionsInterface";
 import React, { useEffect } from "react";
@@ -16,6 +17,7 @@ function QRCodeScanner({
   onScanned,
   startScanning = true,
 }: QRCodeScannerProps) {
+  const isFocused = useIsFocused();
   const [isScanning, setScanning] = React.useState(startScanning);
   const [isLoading, setLoading] = React.useState(false);
   const [permissionStatus, setPermissionStatus] = React.useState(
@@ -72,7 +74,9 @@ function QRCodeScanner({
               </Text>
             </View>
           )}
-          {isScanning && <FocusableCamera onScanned={handleScanned} />}
+          {isScanning && isFocused && (
+            <FocusableCamera onScanned={handleScanned} />
+          )}
         </>
       )}
     </View>

diff --git a/components/ToastConfig.tsx b/components/ToastConfig.tsx
@@ -1,7 +1,6 @@
 import { Link } from "expo-router";
 import { View } from "react-native";
 import { ToastConfig } from "react-native-toast-message";
-import { useAppStore } from "~/lib/state/appStore";
 import { CircleCheck, XCircle } from "./Icons";
 import { Button } from "./ui/button";
 import { Text } from "./ui/text";
@@ -35,18 +34,13 @@ export const toastConfig: ToastConfig = {
     </View>
   ),
   connectionError: ({ text1, text2, hide }) => {
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    const selectedWalletId = useAppStore((store) => store.selectedWalletId);
     return (
       <View className="bg-foreground rounded-xl px-6 py-3 mx-6 flex flex-col gap-2">
         <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>
-        <Link
-          href={`/settings/wallets/${selectedWalletId}/wallet-connection`}
-          asChild
-        >
+        <Link href={`/settings/wallets`} asChild>
           <Button variant="secondary" size="sm">
             <Text>Update Wallet Connection</Text>
           </Button>

diff --git a/components/ui/card.tsx b/components/ui/card.tsx
@@ -11,7 +11,7 @@ const Card = React.forwardRef<
   <View
     ref={ref}
     className={cn(
-      "rounded-lg border border-border bg-card shadow-sm shadow-foreground/10",
+      "rounded-2xl border border-border bg-card shadow-sm shadow-foreground/10",
       className,
     )}
     {...props}
@@ -25,7 +25,7 @@ const CardHeader = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <View
     ref={ref}
-    className={cn("flex flex-col space-y-1.5 p-6", className)}
+    className={cn("flex flex-col space-y-1.5 p-5", className)}
     {...props}
   />
 ));
@@ -39,6 +39,8 @@ const CardTitle = React.forwardRef<
     role="heading"
     aria-level={3}
     ref={ref}
+    numberOfLines={1}
+    ellipsizeMode="tail"
     className={cn(
       "text-xl text-card-foreground font-semibold2 leading-none tracking-tight",
       className,
@@ -54,7 +56,7 @@ const CardDescription = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <Text
     ref={ref}
-    className={cn("text-sm text-muted-foreground", className)}
+    className={cn("mt-1 text-sm text-muted-foreground", className)}
     {...props}
   />
 ));
@@ -65,7 +67,7 @@ const CardContent = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof View>
 >(({ className, ...props }, ref) => (
   <TextClassContext.Provider value="text-card-foreground">
-    <View ref={ref} className={cn("p-6 pt-0", className)} {...props} />
+    <View ref={ref} className={cn("p-5", className)} {...props} />
   </TextClassContext.Provider>
 ));
 CardContent.displayName = "CardContent";
@@ -76,7 +78,7 @@ const CardFooter = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <View
     ref={ref}
-    className={cn("flex flex-row items-center p-6 pt-0", className)}
+    className={cn("flex flex-row items-center p-5", className)}
     {...props}
   />
 ));

diff --git a/lib/state/appStore.ts b/lib/state/appStore.ts
@@ -24,6 +24,7 @@ interface AppState {
   setSecurityEnabled(securityEnabled: boolean): void;
   addWallet(wallet: Wallet): void;
   addAddressBookEntry(entry: AddressBookEntry): void;
+  removeAddressBookEntry: (index: number) => void;
   reset(): void;
   getLastAlbyPayment(): Date | null;
   updateLastAlbyPayment(): void;
@@ -140,6 +141,26 @@ export const useAppStore = create<AppState>()((set, get) => {
     });
   };
 
+  const removeAddressBookEntry = (index: number) => {
+    const addressBookEntries = [...get().addressBookEntries];
+    if (index < 0 || index >= addressBookEntries.length) {
+      return;
+    }
+
+    addressBookEntries.splice(index, 1);
+
+    for (let i = index; i < addressBookEntries.length; i++) {
+      secureStorage.setItem(
+        getAddressBookEntryKey(i),
+        JSON.stringify(addressBookEntries[i]),
+      );
+    }
+
+    secureStorage.removeItem(getAddressBookEntryKey(addressBookEntries.length));
+
+    set({ addressBookEntries });
+  };
+
   const initialSelectedWalletId = +(
     secureStorage.getItem(selectedWalletIdKey) || "0"
   );
@@ -162,6 +183,7 @@ export const useAppStore = create<AppState>()((set, get) => {
     selectedWalletId: initialSelectedWalletId,
     updateCurrentWallet,
     removeCurrentWallet,
+    removeAddressBookEntry,
     setUnlocked: (unlocked) => {
       set({ unlocked });
     },

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "alby-go",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "main": "./index.js",
   "scripts": {
     "start": "expo start",

diff --git a/pages/send/AddressBook.tsx b/pages/send/AddressBook.tsx
@@ -1,18 +1,20 @@
 import { Link, router } from "expo-router";
-import { Pressable, ScrollView, View } from "react-native";
+import { Pressable, ScrollView, TouchableOpacity, View } from "react-native";
+import { Trash2 } from "~/components/Icons";
 import Screen from "~/components/Screen";
 import { Button } from "~/components/ui/button";
 import {
   Card,
+  CardContent,
   CardDescription,
-  CardHeader,
   CardTitle,
 } from "~/components/ui/card";
 import { Text } from "~/components/ui/text";
 import { useAppStore } from "~/lib/state/appStore";
 
 export function AddressBook() {
   const addressBookEntries = useAppStore((store) => store.addressBookEntries);
+
   return (
     <View className="flex-1 flex flex-col p-6 gap-3">
       <Screen title="Address Book" />
@@ -30,16 +32,35 @@ export function AddressBook() {
                   },
                 });
               }}
+              className="mb-4"
             >
-              <Card className="w-full mb-4">
-                <CardHeader className="w-full">
-                  <CardTitle>
-                    {addressBookEntry.name || addressBookEntry.lightningAddress}
-                  </CardTitle>
-                  <CardDescription>
-                    {addressBookEntry.lightningAddress}
-                  </CardDescription>
-                </CardHeader>
+              <Card>
+                <CardContent className="flex flex-row items-center gap-4">
+                  <View className="h-10 w-10 flex items-center justify-center rounded-full bg-accent">
+                    <Text className="text-foreground text-base font-bold">
+                      {addressBookEntry.name?.[0]?.toUpperCase() ||
+                        addressBookEntry.lightningAddress?.[0]?.toUpperCase() ||
+                        "SN"}
+                    </Text>
+                  </View>
+                  <View className="flex flex-1 flex-col">
+                    <CardTitle>
+                      {addressBookEntry.name ||
+                        addressBookEntry.lightningAddress}
+                    </CardTitle>
+                    <CardDescription>
+                      {addressBookEntry.lightningAddress}
+                    </CardDescription>
+                  </View>
+                  <TouchableOpacity
+                    onPress={(e) => {
+                      e.stopPropagation();
+                      useAppStore.getState().removeAddressBookEntry(index);
+                    }}
+                  >
+                    <Trash2 className="text-destructive" />
+                  </TouchableOpacity>
+                </CardContent>
               </Card>
             </Pressable>
           ))

diff --git a/pages/settings/address-book/NewAddressBookEntry.tsx b/pages/settings/address-book/NewAddressBookEntry.tsx
@@ -17,7 +17,7 @@ export function NewAddressBookEntry() {
     <DismissableKeyboardView>
       <View className="flex-1 flex flex-col">
         <View className="flex-1 flex flex-col p-3 gap-3">
-          <Screen title="New Address Book Entry" />
+          <Screen title="New Contact" />
           <Label nativeID="name" className="self-start justify-self-start">
             Name
           </Label>
@@ -51,6 +51,7 @@ export function NewAddressBookEntry() {
         </View>
         <View className="p-6">
           <Button
+            disabled={!name || !lightningAddress}
             onPress={() => {
               useAppStore
                 .getState()