add unlocked eGifts (#200)

MakePrisms · Dec 2, 2024 · 3146884 · 3146884
1 parent f1f0eb0
commit 3146884
Show file tree

Hide file tree

Showing 14 changed files with 114 additions and 25 deletions.
diff --git a/prisma/migrations/20241126183831_make_token_optional/migration.sql b/prisma/migrations/20241126183831_make_token_optional/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Token" ALTER COLUMN "token" DROP NOT NULL;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -98,7 +98,7 @@ model Notification {
 
 model Token {
   id               String          @id
-  token            String
+  token            String?
   createdAt        DateTime        @default(now())
   redeemedAt       DateTime?
   giftId           Int?

diff --git a/src/components/buttons/Send/SendFlow.tsx b/src/components/buttons/Send/SendFlow.tsx
@@ -272,7 +272,7 @@ const SendFlow = ({ onClose }: SendFlowProps) => {
       }
    };
 
-   const handleSelectContact = (contact: PublicContact) => {
+   const handleSelectContact = (contact?: PublicContact) => {
       if (state.isGiftMode) {
          setState({ ...state, step: 'selectGift', contact });
       } else {

diff --git a/src/components/eGifts/ViewGiftModal.tsx b/src/components/eGifts/ViewGiftModal.tsx
@@ -11,15 +11,25 @@ interface ViewGiftModalProps {
    stickerPath: string;
    selectedContact: PublicContact | null;
    txid: string;
+   token?: string;
 }
 
 interface ViewGiftModalBodyProps {
    amountCents: number;
    stickerPath: string;
    txid?: string;
+   token?: string;
 }
 
-export const ViewGiftModalBody = ({ amountCents, stickerPath, txid }: ViewGiftModalBodyProps) => {
+export const ViewGiftModalBody = ({
+   amountCents,
+   stickerPath,
+   txid,
+   token,
+}: ViewGiftModalBodyProps) => {
+   const base = `${window.location.origin}/wallet?`;
+   const toCopy = token ? base + `token=${token}` : base + `txid=${txid}`;
+
    return (
       <Modal.Body>
          <div className='flex flex-col justify-center items-center text-black text-4xl '>
@@ -32,7 +42,7 @@ export const ViewGiftModalBody = ({ amountCents, stickerPath, txid }: ViewGiftMo
             />
             {txid && (
                <ClipboardButton
-                  toCopy={`${window.location.origin}/wallet?txid=${txid}`}
+                  toCopy={toCopy}
                   toShow={'Share'}
                   className='btn-primary hover:!bg-[var(--btn-primary-bg)] mt-6'
                />
@@ -49,6 +59,7 @@ export const ViewGiftModal = ({
    stickerPath,
    selectedContact,
    txid,
+   token,
 }: ViewGiftModalProps) => {
    return (
       <Modal show={isOpen} onClose={() => onClose()}>
@@ -60,7 +71,12 @@ export const ViewGiftModal = ({
                </a>
             </h2>
          </Modal.Header>
-         <ViewGiftModalBody amountCents={amountCents} stickerPath={stickerPath} txid={txid} />
+         <ViewGiftModalBody
+            amountCents={amountCents}
+            stickerPath={stickerPath}
+            txid={txid}
+            token={token}
+         />
       </Modal>
    );
 };

diff --git a/src/components/transactionHistory/HistoryTable.tsx b/src/components/transactionHistory/HistoryTable.tsx
@@ -17,6 +17,7 @@ const HistoryTable: React.FC<{
    const [isSendModalOpen, setIsSendModalOpen] = useState(false);
    const [tokenLockedTo, setTokenLockedTo] = useState<PublicContact | null>(null);
    const [txid, setTxid] = useState<string | undefined>();
+   const [token, setToken] = useState<string | undefined>();
    const [isViewGiftModalOpen, setIsViewGiftModalOpen] = useState(false);
    const [selectedGift, setSelectedGift] = useState<GiftAsset | undefined>(undefined);
 
@@ -30,21 +31,22 @@ const HistoryTable: React.FC<{
    const openViewGiftModal = async (tx: EcashTransaction & { giftId: number }) => {
       setIsViewGiftModalOpen(true);
       setIsSendModalOpen(false);
-      const gift = await getGiftById(tx.giftId);
+      const gift = getGiftById(tx.giftId);
       if (!gift) {
          console.error('Gift not found:', tx.gift);
          return;
       }
       setSelectedGift(gift);
+      /** Begin backwards compatibility  for < v0.2.2 */
+      if (new Date(tx.date).getTime() > 1724352697905) {
+         setTxid(computeTxId(tx.token));
+      }
+      /** End backwards compatibility  for < v0.2.2 */
       if (tx.pubkey) {
-         /** Begin backwards compatibility  for < v0.2.2 */
-         if (new Date(tx.date).getTime() > 1724352697905) {
-            setTxid(computeTxId(tx.token));
-         }
-         /** End backwards compatibility  for < v0.2.2 */
          const contact = await fetchContact(tx.pubkey?.slice(2));
          setTokenLockedTo(contact);
       }
+      setToken(tx.token);
    };
 
    const openSendEcashModal = async (tx: EcashTransaction) => {
@@ -94,6 +96,7 @@ const HistoryTable: React.FC<{
                selectedContact={tokenLockedTo}
                amountCents={selectedGift.amount}
                txid={txid}
+               token={token}
             />
          )}
       </>

diff --git a/src/components/views/SelectContact.tsx b/src/components/views/SelectContact.tsx
@@ -1,6 +1,6 @@
 import ContactTableRowItem from '../modals/ContactsModal/ContactTableRowItem';
 import useContacts from '@/hooks/boardwalk/useContacts';
-import { UserPlusIcon } from '@heroicons/react/20/solid';
+import { ArrowRightIcon, UserPlusIcon } from '@heroicons/react/20/solid';
 import { Button, Table, TextInput } from 'flowbite-react';
 import { useMemo, useState } from 'react';
 import { PublicContact } from '@/types';
@@ -12,7 +12,7 @@ import { contactsTableTheme } from '@/themes/tableThemes';
 const SelectContact = ({
    onSelectContact,
 }: {
-   onSelectContact: (contact: PublicContact) => void;
+   onSelectContact: (contact?: PublicContact) => void;
 }) => {
    const [currentView, setCurrentView] = useState<'select' | 'add'>('select');
    const [addingContact, setAddingContact] = useState(false);
@@ -65,7 +65,7 @@ const SelectContact = ({
    return (
       <div className='flex flex-col items-center justify-start space-y-4 w-full h-full'>
          {currentView === 'select' ? (
-            <>
+            <div className='flex flex-col h-full w-full'>
                <div className='flex justify-between items-center mb-3 w-full'>
                   <TextInput
                      placeholder='Search contacts'
@@ -96,7 +96,17 @@ const SelectContact = ({
                      </Table.Body>
                   </Table>
                </div>
-            </>
+               <div className='mt-auto self-end'>
+                  <Button
+                     onClick={() => onSelectContact(undefined)}
+                     color='primary'
+                     className='btn-primary'
+                  >
+                     Skip
+                     <ArrowRightIcon className='h-5 w-5' />
+                  </Button>
+               </div>
+            </div>
          ) : (
             <form onSubmit={handleAddContact} className='w-full'>
                <div>

diff --git a/src/hooks/boardwalk/useWallet.tsx b/src/hooks/boardwalk/useWallet.tsx
@@ -3,12 +3,12 @@ import { Currency, GiftAsset, MintQuoteStateExt, PublicContact } from '@/types';
 import { useProofStorage } from '../cashu/useProofStorage';
 import { useCashuContext } from '../contexts/cashuContext';
 import { setSuccess } from '@/redux/slices/ActivitySlice';
-import { postTokenToDb } from '@/utils/appApiRequests';
+import { postTokenToDb, postUnlockedGiftToDb } from '@/utils/appApiRequests';
 import useNotifications from './useNotifications';
 import { MintQuoteState } from '@cashu/cashu-ts';
 import { formatUnit } from '@/utils/formatting';
 import useMintlessMode from './useMintlessMode';
-import { isMintQuoteExpired } from '@/utils/cashu';
+import { computeTxId, isMintQuoteExpired } from '@/utils/cashu';
 import { useAppDispatch } from '@/redux/store';
 import { useCashu } from '../cashu/useCashu';
 import { useToast } from '../util/useToast';
@@ -176,13 +176,16 @@ const useWallet = () => {
          if (contact) {
             txid = await postTokenToDb(sendableToken, gift?.id);
             await sendTokenAsNotification(sendableToken, txid);
+         } else if (gift) {
+            txid = computeTxId(sendableToken);
+            await postUnlockedGiftToDb(txid, gift.id);
          }
 
          addToast(
             `eGift sent (${formatUnit(gift.amount + (gift?.fee || 0), activeUnit)})`,
             'success',
          );
-         return { txid, token: sendableToken };
+         return { txid: contact ? txid : undefined, token: sendableToken };
       } catch (error: any) {
          console.error('Error sending token:', error);
          const msg = error.message || 'Failed to send token';

diff --git a/src/lib/tokenModels.ts b/src/lib/tokenModels.ts
@@ -22,6 +22,19 @@ export const createTokenInDb = async (data: PostTokenRequest, txid: string, isFe
    return token;
 };
 
+export const createUnlockedGift = async (txid: string, giftId: number) => {
+   const token = await prisma.token.create({
+      data: {
+         giftId,
+         id: txid,
+         recipientPubkey: null,
+         isFee: false,
+      },
+   });
+
+   return token;
+};
+
 export const findTokenByTxId = async (txid: string) => {
    return await prisma.token.findUnique({
       where: {

diff --git a/src/pages/api/token/gift.ts b/src/pages/api/token/gift.ts
@@ -0,0 +1,20 @@
+import { createUnlockedGift } from '@/lib/tokenModels';
+import { PostTokenResponse, PostUnlockedGiftRequest } from '@/types';
+import type { NextApiRequest, NextApiResponse } from 'next';
+
+export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+   if (req.method === 'POST') {
+      try {
+         const { txid, giftId } = req.body as PostUnlockedGiftRequest;
+
+         await createUnlockedGift(txid, Number(giftId));
+
+         return res.status(200).json({ txid } as PostTokenResponse);
+      } catch (error: any) {
+         return res.status(500).json({ message: error.message });
+      }
+   } else {
+      res.setHeader('Allow', ['POST']);
+      res.status(405).end(`Method ${req.method} Not Allowed`);
+   }
+}
diff --git a/src/pages/api/token/pr/[id]/index.ts b/src/pages/api/token/pr/[id]/index.ts
@@ -43,7 +43,12 @@ export default async function handler(
                .status(400)
                .json({ error: 'Does not support checking reusable payment requests' });
          } else if (paymentRequest.tokens.length > 0) {
-            token = paymentRequest.tokens[0].token;
+            const prTok = paymentRequest.tokens[0].token;
+            if (prTok) {
+               token = prTok;
+            } else {
+               throw new Error('Token does not exist on payment request');
+            }
          }
 
          return res.status(200).json({

diff --git a/src/pages/api/token/pr/[id]/last-paid.ts b/src/pages/api/token/pr/[id]/last-paid.ts
@@ -35,7 +35,7 @@ export default async function handler(
                  )
                : null;
 
-         if (!latestToken) {
+         if (!latestToken || !latestToken.token) {
             return res.status(200).json({ token: null, lastPaid: null });
          }
 

diff --git a/src/pages/wallet.tsx b/src/pages/wallet.tsx
@@ -22,7 +22,7 @@ import { useCashu } from '@/hooks/cashu/useCashu';
 import { useCashuContext } from '@/hooks/contexts/cashuContext';
 import { PublicContact, TokenProps, GiftAsset, Currency } from '@/types';
 import { findContactByPubkey, isContactsTrustedMint } from '@/lib/contactModels';
-import { proofsLockedTo } from '@/utils/cashu';
+import { computeTxId, proofsLockedTo } from '@/utils/cashu';
 import { formatUrl, getRequestedDomainFromRequest } from '@/utils/url';
 import NotificationDrawer from '@/components/notifications/NotificationDrawer';
 import { formatTokenAmount } from '@/utils/formatting';
@@ -292,19 +292,27 @@ export const getServerSideProps: GetServerSideProps = async (
    let token = context.query.token as string;
    let giftPath = null;
    let gift: GiftAsset | undefined = undefined;
-   const txid = context.query.txid as string;
+   const txid = context.query.txid
+      ? (context.query.txid as string)
+      : token
+        ? computeTxId(token)
+        : undefined;
 
    const baseRequestUrl = getRequestedDomainFromRequest(context.req);
 
-   if (txid && !token) {
+   if (txid) {
       const tokenEntry = await findTokenByTxId(txid);
       if (tokenEntry) {
-         token = tokenEntry.token;
          if (tokenEntry.giftId) {
             gift = await lookupGiftById(tokenEntry.giftId);
             giftPath = gift?.selectedSrc || null;
          }
       }
+
+      if (!token) {
+         if (!tokenEntry?.token) throw new Error('Token not found');
+         token = tokenEntry.token;
+      }
    }
 
    let tokenData: TokenProps | null = null;

diff --git a/src/types.ts b/src/types.ts
@@ -257,12 +257,17 @@ export type PostTokenRequest = {
    isFee?: boolean;
 };
 
+export type PostUnlockedGiftRequest = {
+   giftId: number;
+   txid: string;
+};
+
 export type PostTokenResponse = {
    txid: string;
 };
 
 export type GetTokenResponse = {
-   token: string;
+   token: string | null;
    giftId: number | null;
 };
 

diff --git a/src/utils/appApiRequests.ts b/src/utils/appApiRequests.ts
@@ -175,6 +175,10 @@ export const postTokenToDb = async (token: string, giftId?: number, isFee?: bool
    ).txid;
 };
 
+export const postUnlockedGiftToDb = async (txid: string, giftId: number) => {
+   return await request<PostTokenResponse>(`/api/token/gift`, 'POST', { txid, giftId });
+};
+
 export const getTokenFromDb = async (txid: string) => {
    return await request<GetTokenResponse>(`/api/token/${txid}`, 'GET', undefined);
 };
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		-- AlterTable
		ALTER TABLE "Token" ALTER COLUMN "token" DROP NOT NULL;
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,7 @@ export default async function handler( @@
                      )
                    : null;
-             if (!latestToken) {
+             if (!latestToken || !latestToken.token) {
                 return res.status(200).json({ token: null, lastPaid: null });
              }
@@ Expand Down @@