@rpg-engine/long-bow 0.8.232 → 0.8.233

package/dist/components/Store/CartView.d.ts

@@ -6,11 +6,21 @@ interface ICartItem {
     quantity: number;
     metadata?: Record<string, any>;
 }
+export declare type PurchaseResult = {
+    status: 'success';
+} | {
+    status: 'cancelled';
+} | {
+    status: 'failed';
+    error?: string;
+};
+export declare type LegacyPurchaseResult = boolean;
+export declare type CartPurchaseResult = PurchaseResult | LegacyPurchaseResult;
 export interface ICartViewProps {
     cartItems: ICartItem[];
     onRemoveFromCart: (itemKey: string) => void;
     onClose: () => void;
-    onPurchase: () => Promise<boolean>;
+    onPurchase: () => Promise<CartPurchaseResult>;
     atlasJSON: Record<string, any>;
     atlasIMG: string;
     paymentMethodLabel?: string;

package/dist/components/Store/PaymentMethodModal.d.ts

@@ -7,5 +7,6 @@ export interface IPaymentMethodModalProps {
     onPayWithPix: () => void;
     onClose: () => void;
     showPix?: boolean;
+    isProcessing?: boolean;
 }
 export declare const PaymentMethodModal: React.FC<IPaymentMethodModalProps>;

package/dist/components/Store/Store.d.ts

@@ -1,5 +1,6 @@
 import { IItemPack, IPurchase, IProductBlueprint, UserAccountTypes } from '@rpg-engine/shared';
 import React from 'react';
+import { CartPurchaseResult } from './CartView';
 import { IFeaturedItem } from './FeaturedBanner';
 import { TabId } from './hooks/useStoreTabs';
 export interface IStoreProps {
@@ -7,7 +8,7 @@ export interface IStoreProps {
     packs?: IItemPack[];
     atlasJSON: any;
     atlasIMG: string;
-    onPurchase: (purchase: Partial<IPurchase>) => Promise<boolean>;
+    onPurchase: (purchase: Partial<IPurchase>) => Promise<CartPurchaseResult>;
     onShowHistory?: () => void;
     onShowWallet?: () => void;
     walletLabel?: string;

package/dist/components/Store/hooks/useStoreCart.d.ts

@@ -1,4 +1,5 @@
 import { IPurchase, IProductBlueprint } from '@rpg-engine/shared';
+import { CartPurchaseResult } from '../CartView';
 interface ICartItem {
     item: IProductBlueprint;
     quantity: number;
@@ -9,7 +10,7 @@ interface IUseStoreCart {
     isCartOpen: boolean;
     handleAddToCart: (item: IProductBlueprint, quantity: number, metadata?: Record<string, any>) => void;
     handleRemoveFromCart: (itemKey: string) => void;
-    handlePurchase: (onPurchase: (purchase: IPurchase) => Promise<boolean>) => Promise<boolean>;
+    handlePurchase: (onPurchase: (purchase: IPurchase) => Promise<CartPurchaseResult>) => Promise<CartPurchaseResult>;
     openCart: () => void;
     closeCart: () => void;
     getTotalItems: () => number;

package/dist/long-bow.cjs.development.js

@@ -38006,6 +38006,17 @@ var CloseLink = /*#__PURE__*/styled__default.div.withConfig({
   componentId: "sc-18z5q21-16"
 })(["font-family:'Press Start 2P',cursive;font-size:0.5rem;color:rgba(255,255,255,0.45);cursor:pointer;display:flex;align-items:center;gap:0.3rem;transition:color 0.15s;&:hover{color:rgba(255,255,255,0.7);}"]);
 
+var GENERIC_PURCHASE_FAILED_MESSAGE = 'Purchase failed. Please try again.';
+var normalizePurchaseResult = function normalizePurchaseResult(result) {
+  if (typeof result === 'boolean') {
+    return result ? {
+      status: 'success'
+    } : {
+      status: 'failed'
+    };
+  }
+  return result;
+};
 var MetadataDisplay = function MetadataDisplay(_ref) {
   var type = _ref.type,
     metadata = _ref.metadata;
@@ -38053,7 +38064,7 @@ var CartView = function CartView(_ref2) {
   };
   var handlePurchase = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var snapshot, trackItems, success, errMsg, _errMsg;
+      var snapshot, trackItems, purchaseResult, _purchaseResult$error, errMsg, _errMsg;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -38069,36 +38080,38 @@ var CartView = function CartView(_ref2) {
               };
             });
             onCheckoutStart == null ? void 0 : onCheckoutStart(trackItems, total);
-            _context.next = 8;
+            _context.t0 = normalizePurchaseResult;
+            _context.next = 9;
             return onPurchase();
-          case 8:
-            success = _context.sent;
-            if (success) {
+          case 9:
+            _context.t1 = _context.sent;
+            purchaseResult = (0, _context.t0)(_context.t1);
+            if (purchaseResult.status === 'success') {
               onPurchaseSuccess == null ? void 0 : onPurchaseSuccess(trackItems, total);
               setPurchasedItems(snapshot);
-            } else {
-              errMsg = 'Purchase failed. Please try again.';
+            } else if (purchaseResult.status === 'failed') {
+              errMsg = (_purchaseResult$error = purchaseResult.error) != null ? _purchaseResult$error : GENERIC_PURCHASE_FAILED_MESSAGE;
               onPurchaseError == null ? void 0 : onPurchaseError(errMsg);
               setError(errMsg);
             }
-            _context.next = 18;
+            _context.next = 20;
             break;
-          case 12:
-            _context.prev = 12;
-            _context.t0 = _context["catch"](0);
+          case 14:
+            _context.prev = 14;
+            _context.t2 = _context["catch"](0);
             _errMsg = 'An error occurred during purchase. Please try again.';
             onPurchaseError == null ? void 0 : onPurchaseError(_errMsg);
             setError(_errMsg);
-            console.error('Purchase error:', _context.t0);
-          case 18:
-            _context.prev = 18;
+            console.error('Purchase error:', _context.t2);
+          case 20:
+            _context.prev = 20;
             setIsLoading(false);
-            return _context.finish(18);
-          case 21:
+            return _context.finish(20);
+          case 23:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 12, 18, 21]]);
+      }, _callee, null, [[0, 14, 20, 23]]);
     }));
     return function handlePurchase() {
       return _ref3.apply(this, arguments);
@@ -38617,7 +38630,7 @@ var useStoreCart = function useStoreCart() {
   };
   var handlePurchase = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(onPurchase) {
-      var purchaseUnits, purchase, success;
+      var purchaseUnits, purchase, result, success;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -38641,13 +38654,14 @@ var useStoreCart = function useStoreCart() {
             _context2.next = 4;
             return onPurchase(purchase);
           case 4:
-            success = _context2.sent;
+            result = _context2.sent;
+            success = typeof result === 'boolean' ? result : result.status === 'success';
             if (success && isMounted.current) {
               setCartItems([]);
               setIsCartOpen(false);
             }
-            return _context2.abrupt("return", success);
-          case 7:
+            return _context2.abrupt("return", result);
+          case 8:
           case "end":
             return _context2.stop();
         }
@@ -38781,7 +38795,9 @@ var PaymentMethodModal = function PaymentMethodModal(_ref) {
     onPayWithPix = _ref.onPayWithPix,
     onClose = _ref.onClose,
     _ref$showPix = _ref.showPix,
-    showPix = _ref$showPix === void 0 ? false : _ref$showPix;
+    showPix = _ref$showPix === void 0 ? false : _ref$showPix,
+    _ref$isProcessing = _ref.isProcessing,
+    isProcessing = _ref$isProcessing === void 0 ? false : _ref$isProcessing;
   var _useState = React.useState('card'),
     selected = _useState[0],
     setSelected = _useState[1];
@@ -38795,6 +38811,7 @@ var PaymentMethodModal = function PaymentMethodModal(_ref) {
     e.stopPropagation();
   }, []);
   var handleConfirm = React.useCallback(function () {
+    if (isProcessing) return;
     if (selected === 'dc' && !dcDisabled) {
       onPayWithDC();
     } else if (selected === 'pix') {
@@ -38802,7 +38819,10 @@ var PaymentMethodModal = function PaymentMethodModal(_ref) {
     } else {
       onPayWithCard();
     }
-  }, [selected, dcDisabled, onPayWithDC, onPayWithCard, onPayWithPix]);
+  }, [selected, dcDisabled, isProcessing, onPayWithDC, onPayWithCard, onPayWithPix]);
+  var handleClose = React.useCallback(function () {
+    if (!isProcessing) onClose();
+  }, [isProcessing, onClose]);
   var dcSubText = dcRequired !== undefined ? React__default.createElement(React__default.Fragment, null, React__default.createElement(MMORPGNumber, {
     value: dcBalance
   }), " DC available \xB7", ' ', React__default.createElement(MMORPGNumber, {
@@ -38811,40 +38831,44 @@ var PaymentMethodModal = function PaymentMethodModal(_ref) {
     value: dcBalance
   }), " DC available");
   return React__default.createElement(ModalPortal, null, React__default.createElement(Overlay$b, {
-    onPointerDown: onClose
+    onPointerDown: handleClose
   }), React__default.createElement(ModalContainer$8, null, React__default.createElement(ModalContent$8, {
     onClick: stopPropagation,
     onTouchStart: stopPropagation,
     onPointerDown: stopPropagation
   }, React__default.createElement(Header$i, null, React__default.createElement(Title$p, null, "How would you like to pay?"), React__default.createElement(CloseButton$j, {
-    onPointerDown: onClose,
-    "aria-label": "Close"
+    onPointerDown: handleClose,
+    "aria-label": "Close",
+    disabled: isProcessing
   }, React__default.createElement(Cancel.Cancel, null))), React__default.createElement(Options$1, null, React__default.createElement(RadioOption$2, {
     "$selected": selected === 'card',
-    onPointerDown: function onPointerDown() {
+    "$disabled": isProcessing,
+    onPointerDown: isProcessing ? undefined : function () {
       return setSelected('card');
     }
   }, React__default.createElement(RadioCircle$3, {
     "$selected": selected === 'card'
   }), React__default.createElement(OptionText$1, null, React__default.createElement(OptionLabel$2, null, "Credit Card"), React__default.createElement(OptionSub$1, null, "Stripe secure checkout"))), showPix && React__default.createElement(RadioOption$2, {
     "$selected": selected === 'pix',
-    onPointerDown: function onPointerDown() {
+    "$disabled": isProcessing,
+    onPointerDown: isProcessing ? undefined : function () {
       return setSelected('pix');
     }
   }, React__default.createElement(RadioCircle$3, {
     "$selected": selected === 'pix'
   }), React__default.createElement(OptionText$1, null, React__default.createElement(OptionLabel$2, null, "Pix"), React__default.createElement(OptionSub$1, null, "Instant payment via Pix"))), React__default.createElement(RadioOption$2, {
     "$selected": selected === 'dc',
-    "$disabled": dcDisabled,
-    onPointerDown: dcDisabled ? undefined : function () {
+    "$disabled": dcDisabled || isProcessing,
+    onPointerDown: dcDisabled || isProcessing ? undefined : function () {
       return setSelected('dc');
     }
   }, React__default.createElement(RadioCircle$3, {
     "$selected": selected === 'dc'
   }), React__default.createElement(OptionText$1, null, React__default.createElement(OptionLabel$2, null, "Definya Coin"), React__default.createElement(OptionSub$1, null, dcSubText)))), React__default.createElement(ConfirmRow$1, null, React__default.createElement(Button, {
     buttonType: exports.ButtonTypes.RPGUIButton,
-    onPointerDown: handleConfirm
-  }, "Confirm")))));
+    onPointerDown: handleConfirm,
+    disabled: isProcessing
+  }, isProcessing ? 'Processing...' : 'Confirm')))));
 };
 var Overlay$b = /*#__PURE__*/styled__default.div.withConfig({
   displayName: "PaymentMethodModal__Overlay",