Wire up new EdgeTxActionGiftCard fields from edge-core-js

Populate quoteId, productId, and orderId correctly in the saved action
now that the core type has explicit fields. Update GiftCardDetailsCard
with backward-compat detection: if quoteId is absent, treat orderId as
the quoteId per legacy behavior.

Author: Jon-edge

src/components/cards/GiftCardDetailsCard.tsx

@@ -33,10 +33,13 @@ export const GiftCardDetailsCard: React.FC<Props> = ({ action }) => {
   const theme = useTheme()
   const styles = getStyles(theme)
 
-  // Backward compat: Prior versions stored the quoteId in the `orderId` field
-  // of EdgeTxActionGiftCard. Once edge-core-js adds an explicit `quoteId`
-  // field, prefer that and fall back to `orderId` for older transactions.
-  const quoteId = action.orderId
+  // Backward compat: Prior versions stored the quoteId in the orderId field.
+  // Detect legacy transactions by checking whether the explicit quoteId field
+  // is populated. If missing, fall back to orderId which held the quoteId.
+  const quoteId = action.quoteId ?? action.orderId
+  const productId = action.productId
+  // orderId is only meaningful when quoteId is separately populated (new format)
+  const orderId = action.quoteId != null ? action.orderId : undefined
 
   const handleRedeemPress = useHandler(() => {
     if (redemption?.url != null) {
@@ -67,11 +70,17 @@ export const GiftCardDetailsCard: React.FC<Props> = ({ action }) => {
       `${lstrings.string_amount}: ${amountDisplay}`,
       `${lstrings.gift_card_quote_id_label}: ${quoteId}`
     ]
+    if (productId != null) {
+      lines.push(`${lstrings.gift_card_product_id_label}: ${productId}`)
+    }
+    if (orderId != null) {
+      lines.push(`${lstrings.gift_card_order_id_label}: ${orderId}`)
+    }
     if (redemption?.code != null) {
       lines.push(`${lstrings.gift_card_security_code}: ${redemption.code}`)
     }
     return lines.join('\n')
-  }, [card.name, amountDisplay, quoteId, redemption?.code])
+  }, [card.name, amountDisplay, quoteId, productId, orderId, redemption?.code])
 
   const handleCopyAll = useHandler(() => {
     triggerHaptic('impactLight')
@@ -96,6 +105,26 @@ export const GiftCardDetailsCard: React.FC<Props> = ({ action }) => {
 
           <EdgeRow title={lstrings.gift_card_quote_id_label} body={quoteId} />
 
+          {productId != null ? (
+            <>
+              <DividerLineUi4 />
+              <EdgeRow
+                title={lstrings.gift_card_product_id_label}
+                body={productId}
+              />
+            </>
+          ) : null}
+
+          {orderId != null ? (
+            <>
+              <DividerLineUi4 />
+              <EdgeRow
+                title={lstrings.gift_card_order_id_label}
+                body={orderId}
+              />
+            </>
+          ) : null}
+
           {redemption?.code != null ? (
             <>
               <DividerLineUi4 />

src/components/scenes/GiftCardPurchaseScene.tsx

@@ -572,9 +572,12 @@ export const GiftCardPurchaseScene: React.FC<Props> = props => {
             const order = pendingOrderRef.current
 
             // Save the gift card action to the transaction (synced via edge-core)
+            const cartItem = order.cart[0]
             const savedAction: EdgeTxActionGiftCard = {
               actionType: 'giftCard',
-              orderId: order.quoteId,
+              orderId: cartItem.orderId,
+              quoteId: order.quoteId,
+              productId: cartItem.productId,
               provider: {
                 providerId: 'phaze',
                 displayName: 'Phaze'

src/locales/en_US.ts

@@ -1969,6 +1969,8 @@ const strings = {
   gift_card_pending: 'Pending Delivery, Please Wait...',
   gift_card_pending_toast:
     'Your gift card is being delivered. Please wait for a few minutes for it to arrive.',
+  gift_card_order_id_label: 'Order ID',
+  gift_card_product_id_label: 'Product ID',
   gift_card_quote_id_label: 'Quote ID',
   gift_card_quote_id_label_1s: 'QuoteID: %1$s',
   gift_card_quote_expired_toast: 'Your quote has expired. Please try again.',

src/locales/strings/enUS.json

@@ -1530,6 +1530,8 @@
   "gift_card_account_info_user_id": "Phaze User ID",
   "gift_card_pending": "Pending Delivery, Please Wait...",
   "gift_card_pending_toast": "Your gift card is being delivered. Please wait for a few minutes for it to arrive.",
+  "gift_card_order_id_label": "Order ID",
+  "gift_card_product_id_label": "Product ID",
   "gift_card_quote_id_label": "Quote ID",
   "gift_card_quote_id_label_1s": "QuoteID: %1$s",
   "gift_card_quote_expired_toast": "Your quote has expired. Please try again.",