chore: minor improvements

getAlby · Oct 1, 2024 · 8847d10 · 8847d10
1 parent 25c3e3a
commit 8847d10
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/components/AlbyBanner.tsx b/components/AlbyBanner.tsx
@@ -16,7 +16,7 @@ function AlbyBanner() {
         { value: 10000, emoji: '🚀' }
     ];
 
-    function isPaymentOlderThan24Hours(paymentDate: Date | undefined) {
+    function isPaymentOlderThan24Hours(paymentDate: Date | null) {
         if (!paymentDate) return true;
 
         const currentDate = new Date();
@@ -39,6 +39,7 @@ function AlbyBanner() {
                         key={value}
                         variant="secondary"
                         size="sm"
+                        className="flex-1"
                         onPress={() => {
                             router.navigate({
                                 pathname: "/send",

diff --git a/lib/state/appStore.ts b/lib/state/appStore.ts
@@ -24,7 +24,7 @@ interface AppState {
   addAddressBookEntry(entry: AddressBookEntry): void;
   reset(): void;
   showOnboarding(): void;
-  getLastAlbyPayment(): Date | undefined;
+  getLastAlbyPayment(): Date | null;
   updateLastAlbyPayment(): void;
 }
 

diff --git a/pages/settings/wallets/EditWallet.tsx b/pages/settings/wallets/EditWallet.tsx
@@ -13,6 +13,8 @@ import { DEFAULT_WALLET_NAME } from "~/lib/constants";
 import { useAppStore } from "~/lib/state/appStore";
 import * as Clipboard from "expo-clipboard";
 import Screen from "~/components/Screen";
+import { TriangleAlert } from "~/components/Icons";
+import { Nip47Capability } from "@getalby/sdk/dist/NWCClient";
 
 export function EditWallet() {
   const selectedWalletId = useAppStore((store) => store.selectedWalletId);
@@ -22,20 +24,18 @@ export function EditWallet() {
       <Screen
         title="Edit Wallet"
       />
-      {(wallets[selectedWalletId].nwcCapabilities || []).indexOf(
-        "notifications",
-      ) < 0 && (
-          <Text>
-            Warning: Your wallet does not support notifications capability.
-          </Text>
-        )}
-      {(wallets[selectedWalletId].nwcCapabilities || []).indexOf(
-        "list_transactions",
-      ) < 0 && (
-          <Text>
-            Warning: Your wallet does not support list_transactions capability.
-          </Text>
-        )}
+      {(["notifications", "list_transactions"] as Nip47Capability[]).map(capability => 
+        (wallets[selectedWalletId].nwcCapabilities || []).indexOf(capability) < 0 && (
+          <Card key={capability}>
+            <CardHeader>
+              <CardTitle className="flex flex-row gap-3 items-center">
+                <TriangleAlert size={16} className="text-foreground" />
+                <Text>Your wallet does not support {capability}</Text>
+              </CardTitle>
+            </CardHeader>
+          </Card>
+        )
+      )}
       <Link href={`/settings/wallets/${selectedWalletId}/name`} asChild>
         <Pressable>
           <Card className="w-full">