@bunnyapp/components 1.0.68-beta.8 → 1.0.68

package/dist/cjs/index.js

@@ -25,6 +25,24 @@ var pkg = require('pluralize');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
+function _interopNamespace(e) {
+  if (e && e.__esModule) return e;
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
+        });
+      }
+    });
+  }
+  n["default"] = e;
+  return Object.freeze(n);
+}
+
 var styled__default = /*#__PURE__*/_interopDefaultLegacy(styled);
 var theme__default = /*#__PURE__*/_interopDefaultLegacy(theme);
 var request__default = /*#__PURE__*/_interopDefaultLegacy(request);
@@ -156,7 +174,7 @@ var BrandContext = react.createContext({
 });
 
 // This will be replaced at build time by rollup-plugin-replace
-var PACKAGE_VERSION = '1.0.68-beta.8';
+var PACKAGE_VERSION = '1.0.67';
 var createRequestHeaders = function (token) {
     var headers = common.createClientDevHeaders(token);
     // Add the components version header
@@ -391,19 +409,6 @@ function useToken() {
 }
 
 var LISENSE_KEY = 'eyJkYXRhIjoiZXlKMElqb2liM0puWVc1cGVtRjBhVzl1SWl3aVlYWjFJam94TnpneU5ETXhPVGs1TENKa2JTSTZJbUoxYm01NUxtTnZiU0lzSW00aU9pSmhOV1F5TWpKaFpXTTNOelF5TkdFNUlpd2laWGh3SWpveE56WTJORFEzT1RrNUxDSmtiWFFpT2lKM2FXeGtZMkZ5WkNKOSIsInNpZ25hdHVyZSI6ImdJWW5BYWp0WW1aSHV1b1RrTkZCZnRGYjEzUTJOZXZwQXlKRmszdy9STDNUa08rRXZYWlV0MDZxenBrZWdOK1A4TXlkbFY1aityemQvM1VpYlB5SW1VSzAweHZSVk5hS29EOXB0cVpkbjR5SWRRdE1pU1NjZ0J1K1RkM0NXM2FONVNrdlNJVDEyTGpBMnVVYll2RmJ6RFpMci9hODkwa05sT0NQZURoVjMyd0w3R0NrTnV2Z1MyZlk5Mis0L25FdUdvZXBZR0RPN0Ryb3NaOGVlbnJ6b1BsQ044T204eFlMNXJxdUkvS2xLVTVYaGN0allrdzBTR0FlL0pDR1dTN1dLTDAvYmFvbS9GS1ltNU91VmlzcmlDVlc2UXgvbzBnTGE4bUtXLytMb3pNaHdFemdtU2I2S0xERzZpTEVPL0czQ2pYN2p2dTU1NEc4OUx2aW1BaE5BQT09In0=';
-// Custom zoom layout component that uses useZoomContext
-var CustomZoomLayout = function () {
-    // Consume from the controller provider
-    var _a = react$1.useZoomContext(), currentZoom = _a.currentZoom, setZoomLevel = _a.setZoomLevel;
-    var mountTimeRef = react.useRef(Date.now());
-    // Set default zoom to 100% once the document is loaded
-    react.useEffect(function () {
-        if (currentZoom < 1 && Date.now() - mountTimeRef.current < 3000) {
-            setZoomLevel(100);
-        }
-    }, [currentZoom, setZoomLevel]);
-    return jsxRuntime.jsx(jsxRuntime.Fragment, {});
-};
 var DocumentTemplatePreview = function (_a) {
     var targetUrl = _a.targetUrl;
     var _b = react.useState(null), pdfUrl = _b[0], setPdfUrl = _b[1];
@@ -451,13 +456,13 @@ var DocumentTemplatePreview = function (_a) {
     if (!pdfUrl) {
         return jsxRuntime.jsx(jsxRuntime.Fragment, {});
     }
-    return (jsxRuntime.jsx("div", __assign({ className: "bunny-rounded bunny-w-full bunny-overflow-hidden bunny-grow bunny-min-h-0" }, { children: jsxRuntime.jsx(react$1.RPConfig, __assign({ licenseKey: LISENSE_KEY }, { children: jsxRuntime.jsxs(react$1.RPProvider, __assign({ src: pdfUrl }, { children: [jsxRuntime.jsx(CustomZoomLayout, {}), jsxRuntime.jsx(react$1.RPDefaultLayout, __assign({ style: {
-                            width: '100%',
-                            height: '100%',
-                        }, slots: {
-                            openFileTool: false,
-                            downloadTool: false,
-                        } }, { children: jsxRuntime.jsx(react$1.RPPages, {}) }))] })) })) })));
+    return (jsxRuntime.jsx("div", __assign({ className: "bunny-rounded bunny-w-full bunny-overflow-hidden bunny-grow bunny-min-h-0" }, { children: jsxRuntime.jsx(react$1.RPConfig, __assign({ licenseKey: LISENSE_KEY }, { children: jsxRuntime.jsx(react$1.RPProvider, __assign({ src: pdfUrl }, { children: jsxRuntime.jsx(react$1.RPDefaultLayout, __assign({ style: {
+                        width: '100%',
+                        height: '100%',
+                    }, slots: {
+                        openFileTool: false,
+                        downloadTool: false,
+                    } }, { children: jsxRuntime.jsx(react$1.RPPages, {}) })) })) })) })));
 };
 
 var MarkupContainer = defaultStyled.div(templateObject_1$c || (templateObject_1$c = __makeTemplateObject(["\n  span {\n    width: 100%;\n  }\n"], ["\n  span {\n    width: 100%;\n  }\n"])));
@@ -565,15 +570,11 @@ var usePaymentMethod = function (_a) {
 };
 
 var filterPaymentPlugins = function (plugins) {
-    return plugins === null || plugins === void 0 ? void 0 : plugins.filter(function (plugin) { var _a, _b; return ((_a = plugin.type) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'payment' && ((_b = plugin.status) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'valid'; });
-};
-var filterPaymentPluginsByEntity = function (plugins, selectedEntityId) {
     return plugins === null || plugins === void 0 ? void 0 : plugins.filter(function (plugin) {
-        var _a, _b;
-        return selectedEntityId === undefined ||
-            selectedEntityId === null ||
-            ((_a = plugin.entities) === null || _a === void 0 ? void 0 : _a.includes(selectedEntityId)) ||
-            ((_b = plugin.entities) === null || _b === void 0 ? void 0 : _b.length) === 0;
+        var _a, _b, _c, _d;
+        return ((_a = plugin.type) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'payment' &&
+            ((_b = plugin.status) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'valid' &&
+            ((_d = (_c = plugin.components) === null || _c === void 0 ? void 0 : _c.frontend) === null || _d === void 0 ? void 0 : _d.length);
     });
 };
 var MUTATION$9 = "{\n  paymentPlugins {\n    enabled\n    entities\n    guid\n    hidden\n    id\n    name\n    status\n    type\n    webhookEnabled\n    components\n  }\n}";
@@ -602,18 +603,19 @@ var getPaymentPlugins = function (_a) {
     });
 };
 var usePaymentPlugins = function (_a) {
-    var apiHost = _a.apiHost, token = _a.token, selectedEntityId = _a.selectedEntityId;
+    var apiHost = _a.apiHost, token = _a.token;
     var _b = reactQuery.useQuery({
         queryKey: ['paymentPlugins', token],
         queryFn: function () { return getPaymentPlugins({ apiHost: apiHost, token: token }); },
         staleTime: 5 * 60 * 1000, // Consider data fresh for 5 minutes
     }), paymentPlugins = _b.data, isFetched = _b.isFetched;
     var filteredPaymentPlugins = filterPaymentPlugins(paymentPlugins);
-    var filteredPaymentPluginsByEntity = selectedEntityId
-        ? filterPaymentPluginsByEntity(filteredPaymentPlugins, selectedEntityId)
-        : filteredPaymentPlugins;
+    var paymentMethodAllowedPlugins = filteredPaymentPlugins === null || filteredPaymentPlugins === void 0 ? void 0 : filteredPaymentPlugins.filter(function (plugin) {
+        var _a, _b;
+        return (_b = (_a = plugin.components) === null || _a === void 0 ? void 0 : _a.frontend) === null || _b === void 0 ? void 0 : _b.some(function (component) { var _a; return (_a = component === null || component === void 0 ? void 0 : component.scenarios) === null || _a === void 0 ? void 0 : _a.includes('admin-payment_method'); });
+    });
     return {
-        paymentPlugins: filteredPaymentPluginsByEntity,
+        paymentPlugins: paymentMethodAllowedPlugins,
         isFetched: isFetched,
     };
 };
@@ -19086,7 +19088,7 @@ function useSetDefaultPaymentMethod(paymentPlugins, apiHost, token, accountId, o
 var showErrorNotification$1 = common.useErrorNotification();
 var PaymentForm = function (_a) {
     var _b;
-    var invoice = _a.invoice, onFail = _a.onFail, onPaymentSuccess = _a.onPaymentSuccess, onPaymentHoldSuccess = _a.onPaymentHoldSuccess, quote = _a.quote, accountId = _a.accountId, onSavePaymentMethod = _a.onSavePaymentMethod, onRemovePaymentMethod = _a.onRemovePaymentMethod, onSetDefaultPaymentMethod = _a.onSetDefaultPaymentMethod, entityId = _a.entityId, overrideToken = _a.overrideToken, customCheckoutFunction = _a.customCheckoutFunction, currencyIdFromProps = _a.currencyId, paymentHoldOptions = _a.paymentHoldOptions;
+    var invoice = _a.invoice, onFail = _a.onFail, onPaymentSuccess = _a.onPaymentSuccess, onPaymentHoldSuccess = _a.onPaymentHoldSuccess, quote = _a.quote, accountId = _a.accountId, onSavePaymentMethod = _a.onSavePaymentMethod, onRemovePaymentMethod = _a.onRemovePaymentMethod, onSetDefaultPaymentMethod = _a.onSetDefaultPaymentMethod, overrideToken = _a.overrideToken, customCheckoutFunction = _a.customCheckoutFunction, currencyIdFromProps = _a.currencyId, paymentHoldOptions = _a.paymentHoldOptions;
     // Local state
     var _c = react.useState(false), showPaymentMethodForm = _c[0], setShowPaymentMethodForm = _c[1];
     // Simple hooks
@@ -19100,7 +19102,7 @@ var PaymentForm = function (_a) {
         apiHost: apiHost,
     }), storedPaymentMethods = _d.paymentMethods, defaultPaymentMethod = _d.defaultPaymentMethod, isPaymentMethodLoading = _d.isLoading;
     // Complex hooks
-    var paymentPlugins = usePaymentPlugins({ apiHost: apiHost, selectedEntityId: entityId, token: token }).paymentPlugins;
+    var paymentPlugins = usePaymentPlugins({ apiHost: apiHost, token: token }).paymentPlugins;
     var selectedPaymentMethodPlugin = react.useMemo(function () {
         return paymentPlugins === null || paymentPlugins === void 0 ? void 0 : paymentPlugins.find(function (plugin) { var _a, _b, _c; return ((_a = plugin.id) === null || _a === void 0 ? void 0 : _a.toString()) === ((_c = (_b = defaultPaymentMethod === null || defaultPaymentMethod === void 0 ? void 0 : defaultPaymentMethod.plugin) === null || _b === void 0 ? void 0 : _b.id) === null || _c === void 0 ? void 0 : _c.toString()); });
     }, [paymentPlugins, defaultPaymentMethod]);
@@ -19180,15 +19182,6 @@ function StripeWrapper(_a) {
     return (jsxRuntime.jsx(reactStripeJs.Elements, __assign({ options: options, stripe: stripe }, { children: children })));
 }
 
-var useCurrentUserData = function () {
-    var queryClient = reactQuery.useQueryClient();
-    var token = useToken();
-    var currentUser = queryClient.getQueryData(common.QueryKeyFactory.default.currentUserKey(token));
-    if (!currentUser)
-        return {};
-    return currentUser;
-};
-
 function Invoice(_a) {
     var id = _a.id, invoiceQuoteViewComponent = _a.invoiceQuoteViewComponent, backButtonName = _a.backButtonName, onBackButtonClick = _a.onBackButtonClick, onInvoiceDownloadError = _a.onInvoiceDownloadError, onPaymentSuccess = _a.onPaymentSuccess, _b = _a.shadow, shadow = _b === void 0 ? 'shadow-md' : _b, className = _a.className, _c = _a.hideDownloadButton, hideDownloadButton = _c === void 0 ? false : _c, onInvoiceLoaded = _a.onInvoiceLoaded;
     return (jsxRuntime.jsx(InvoiceQuoteContext.Provider, __assign({ value: {
@@ -19208,10 +19201,9 @@ function ActualInvoice() {
     // Context
     var queryClient = reactQuery.useQueryClient();
     var _a = react.useContext(InvoiceQuoteContext), id = _a.id, invoiceQuoteViewComponent = _a.invoiceQuoteViewComponent, backButtonName = _a.backButtonName, onBackButtonClick = _a.onBackButtonClick, onPaymentSuccess = _a.onPaymentSuccess, className = _a.className;
-    var _b = react.useContext(BunnyContext), apiHost = _b.apiHost, onTokenExpired = _b.onTokenExpired;
+    var _b = react.useContext(BunnyContext), apiHost = _b.apiHost, onTokenExpired = _b.onTokenExpired; _b.graphQLClient;
     var _c = react.useContext(InvoiceQuoteContext), hideDownloadButton = _c.hideDownloadButton, onInvoiceLoaded = _c.onInvoiceLoaded;
     var token = useToken();
-    var entityId = useCurrentUserData().entityId;
     // Hooks
     var showSuccessNotification = common.useSuccessNotification();
     var handleAllErrorFormats = common.useAllErrorFormats(onTokenExpired);
@@ -19247,7 +19239,7 @@ function ActualInvoice() {
     }, [formattedInvoice]);
     if (!formattedInvoice)
         return jsxRuntime.jsx(jsxRuntime.Fragment, {});
-    return (jsxRuntime.jsx("div", __assign({ className: "bunny-invoice-container" }, { children: jsxRuntime.jsxs("div", __assign({ className: "bunny-flex bunny-gap-6 bunny-overflow-hidden ".concat(isMobile ? 'bunny-flex-col bunny-w-full' : '', " ").concat(className) }, { children: [formattedInvoice.isLegacy ? (jsxRuntime.jsx("div", __assign({ className: "bunny-flex bunny-justify-center bunny-w-full" }, { children: jsxRuntime.jsx(LegacyDocument, { documentUuid: formattedInvoice.uuid, documentType: "invoice" }) }))) : (invoiceQuoteViewComponent || (jsxRuntime.jsx(InvoiceQuoteView, { html: formattedInvoice.html, formattedInvoice: formattedInvoice, backButtonName: backButtonName, onBackButtonClick: onBackButtonClick }))), isInvoicePayable && (jsxRuntime.jsx("div", __assign({ className: "bunny-w-full ".concat(hideDownloadButton || formattedInvoice.isLegacy ? '' : 'pt-12') }, { children: jsxRuntime.jsx(PaymentForm, { entityId: entityId, onPaymentSuccess: onSuccess, onFail: onFail, invoice: formattedInvoice }) })))] })) })));
+    return (jsxRuntime.jsx("div", __assign({ className: "bunny-invoice-container" }, { children: jsxRuntime.jsxs("div", __assign({ className: "bunny-flex bunny-gap-6 bunny-overflow-hidden ".concat(isMobile ? 'bunny-flex-col bunny-w-full' : '', " ").concat(className) }, { children: [formattedInvoice.isLegacy ? (jsxRuntime.jsx("div", __assign({ className: "bunny-flex bunny-justify-center bunny-w-full" }, { children: jsxRuntime.jsx(LegacyDocument, { documentUuid: formattedInvoice.uuid, documentType: "invoice" }) }))) : (invoiceQuoteViewComponent || (jsxRuntime.jsx(InvoiceQuoteView, { html: formattedInvoice.html, formattedInvoice: formattedInvoice, backButtonName: backButtonName, onBackButtonClick: onBackButtonClick }))), isInvoicePayable && (jsxRuntime.jsx("div", __assign({ className: "bunny-w-full ".concat(hideDownloadButton || formattedInvoice.isLegacy ? '' : 'pt-12') }, { children: jsxRuntime.jsx(PaymentForm, { onPaymentSuccess: onSuccess, onFail: onFail, invoice: formattedInvoice }) })))] })) })));
 }
 
 var MUTATION$7 = function (id) { return "\n  query formattedQuote ($id: ID) {\n    formattedQuote (id: $id) {\n      quote {\n        documentTemplateId\n        documents { id filename size date url }\n        firstInvoice {\n          id\n          state\n        }\n        payableId\n        id\n        payToAccept\n        currentPaymentHold {\n          createdAt\n          expiresAt\n          id\n          updatedAt\n          paymentMethod {\n            accountId\n            createdAt\n            expirationDate\n            failureCode\n            id\n            isDefault\n            lastSuccess\n            paymentType\n            pluginId\n            state\n            updatedAt\n            metadata {\n              description\n              expiration\n              icon\n              identifier\n              issuer\n              kind\n            }\n          }\n        }\n      }\n      payableId\n      acceptedAt\n      acceptedByName\n      amount\n      amountDue\n      amountsByPeriod {\n        id\n        name\n        amount\n      }\n      billingCity\n      billingCountry\n      billingState\n      billingStreet\n      billingZip\n      contactName\n      currency\n      customerBillingCity\n      customerBillingCountry\n      customerBillingState\n      customerBillingStreet\n      customerBillingZip\n      customerName\n      discount\n      discountValue\n      duration\n      endDate\n      expiresAt\n      html\n      formattedLines {\n        amount\n        amountsByPeriod {\n          quantity\n          id\n          name\n          startDate\n          endDate\n          amount\n          amountsByTier {\n            id\n            tier {\n              starts\n              ends\n              price\n            }\n            quantity\n            amount\n          }\n          prorationRate\n        }\n        billingPeriodEnd\n        billingPeriodStart\n        chargeType\n        discount\n        frequency\n        isRamp\n        periods\n        planName\n        position\n        price\n        priceDecimals\n        priceListChargeId\n        priceListChargeName\n        priceListId\n        priceListName\n        priceTiers {\n          price\n          starts\n        }\n        pricingModel\n        productName\n        prorationRate\n        quantity\n        showProductNameOnLineItem\n        taxCode\n        trialEndDate\n        trialStartDate\n        unitOfMeasure\n        vatCode\n      }\n      netPaymentDays\n      notes\n      number\n      poNumberRequired\n      salesContactEmail\n      sharedAt\n      startDate\n      state\n      subtotal\n      taxAmount\n      taxNumberLabel\n      taxNumberRequired\n      vendorName\n    }\n  }"; };
@@ -19368,46 +19360,72 @@ var quoteAccept = function (_a) {
 };
 // export default quoteAccept;
 var useSendAcceptQuote = function (_a) {
-    var quoteId = _a.quoteId, apiHost = _a.apiHost, token = _a.token;
+    _a.onTokenExpired; var quoteId = _a.quoteId, apiHost = _a.apiHost, token = _a.token;
     // Hooks
     var graphQLMutation = common.useGraphQLmutation(function () {
-        console.log('navigate in useGraphQLmutation in useSendAcceptQuote is not yet implemented');
-    }, apiHost || '', function () {
-        console.log('onError in useGraphQLmutation in useSendAcceptQuote is not yet implemented');
+        console.log("navigate in useGraphQLmutation in useSendAcceptQuote is not yet implemented");
+    }, apiHost || "", function () {
+        console.log("onError in useGraphQLmutation in useSendAcceptQuote is not yet implemented");
     });
     var signingPlugins = useSigningPlugins({ apiHost: apiHost, token: token });
     var queryClient = reactQuery.useQueryClient();
-    var showInfoNotification = common.useInfoNotification();
     // Local state
     var _b = react.useState(false), acceptBoxVisible = _b[0], setAcceptBoxVisible = _b[1];
     var _c = react.useState(false), isAccepting = _c[0], setIsAccepting = _c[1];
     // Pandadoc polling modal state
     var _d = react.useState(false), pandadocPollingModalVisible = _d[0], setPandadocPollingModalVisible = _d[1];
     var redirectForSigning = function () {
-        var mutation = "mutation quoteSigningUrlCreate($quoteId: ID) {\n      quoteSigningUrlCreate(quoteId: $quoteId) {\n        redirectUri\n        pluginClientId\n        pluginShortName\n        message\n        errors\n      }\n    }";
+        var mutation = "mutation quoteSigningUrlCreate($quoteId: ID) {\n      quoteSigningUrlCreate(quoteId: $quoteId) {\n        redirectUri\n        pluginClientId\n        pluginShortName\n        errors\n      }\n    }";
         var variables = {
             quoteId: quoteId,
         };
         graphQLMutation(mutation, variables, function (rsp) {
             if (rsp.errors)
-                console.log('rsp.errors', rsp.errors);
+                console.log("rsp.errors", rsp.errors);
             else {
-                var _a = rsp.data.quoteSigningUrlCreate, redirectUri = _a.redirectUri, message = _a.message, pluginShortName = _a.pluginShortName;
-                if (redirectUri) {
-                    // If redirectUri exists, redirect the browser
-                    window.location.href = redirectUri;
+                if (rsp.data.quoteSigningUrlCreate.pluginShortName === "dropbox_sign") {
+                    openDropboxSignModal(rsp.data.quoteSigningUrlCreate.pluginClientId, rsp.data.quoteSigningUrlCreate.redirectUri);
                 }
-                else if (pluginShortName === 'pandadoc') {
+                else if (rsp.data.quoteSigningUrlCreate.pluginShortName === "pandadoc") {
                     setPandadocPollingModalVisible(true);
                 }
-                else if (message) {
-                    // If redirectUri is nil but message exists, display the message as notification
-                    showInfoNotification(message, 'Signing Information');
-                    setIsAccepting(false);
+                else {
+                    window.location.href = rsp.data.quoteSigningUrlCreate.redirectUri;
                 }
             }
         }, token);
     };
+    var openDropboxSignModal = function (clientId, url) { return __awaiter(void 0, void 0, void 0, function () {
+        var HelloSign, client;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (typeof window === "undefined") {
+                        return [2 /*return*/];
+                    }
+                    return [4 /*yield*/, Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('hellosign-embedded')); })];
+                case 1:
+                    HelloSign = (_a.sent()).default;
+                    client = new HelloSign({
+                        clientId: clientId,
+                    });
+                    client.on("sign", function (data) {
+                        queryClient.refetchQueries({
+                            queryKey: common.QueryKeyFactory.default.createQuoteKey({
+                                id: quoteId,
+                                token: token,
+                            }),
+                        });
+                    });
+                    // Open the DropboxSign modal
+                    client.open(url, {
+                        clientId: clientId,
+                        skipDomainVerification: false, // Set true for development testing
+                    });
+                    return [2 /*return*/];
+            }
+        });
+    }); };
     var _e = reactQuery.useMutation({
         mutationFn: function (changedFormItems) { return __awaiter(void 0, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -19533,9 +19551,6 @@ var AcceptQuoteModal = function (_a) {
     var acceptBoxVisible = _a.acceptBoxVisible, formattedQuote = _a.formattedQuote, sendAccept = _a.sendAccept, setAcceptBoxVisible = _a.setAcceptBoxVisible, setIsAccepting = _a.setIsAccepting, isSendAcceptPending = _a.isSendAcceptPending;
     // Refs
     var firstInputRef = react.useRef(null);
-    var apiHost = react.useContext(BunnyContext).apiHost;
-    var token = useToken();
-    var signingPlugins = useSigningPlugins({ apiHost: apiHost, token: token });
     // Hooks
     var form = antd.Form.useForm()[0];
     useFocusFirstInput({ firstInputRef: firstInputRef, isVisible: acceptBoxVisible });
@@ -19544,7 +19559,7 @@ var AcceptQuoteModal = function (_a) {
     var createRules = function (required, title) {
         return required ? [{ required: true, message: "".concat(title, " is required") }] : [];
     };
-    return (jsxRuntime.jsx(StyledModal$1, __assign({ centered: true, okText: isSendAcceptPending ? 'Accepting...' : 'Accept', okButtonProps: {
+    return (jsxRuntime.jsx(StyledModal$1, __assign({ centered: true, okText: isSendAcceptPending ? "Accepting..." : "Accept", okButtonProps: {
             loading: isSendAcceptPending,
             disabled: isSendAcceptPending,
         }, onCancel: function () {
@@ -19557,7 +19572,16 @@ var AcceptQuoteModal = function (_a) {
                 sendAccept(changedFields);
             })
                 .catch(function () { });
-        }, open: acceptBoxVisible, title: (signingPlugins === null || signingPlugins === void 0 ? void 0 : signingPlugins.length) ? 'Start signing' : 'Accept quote', width: 400 }, { children: jsxRuntime.jsxs(antd.Form, __assign({ className: "bunny-flex bunny-flex-col bunny-gap-2", form: form, layout: "vertical" }, { children: [jsxRuntime.jsx(antd.Form.Item, __assign({ label: "Your name", name: "name", rules: createRules(true, 'Your name') }, { children: jsxRuntime.jsx(antd.Input, { autoFocus: true, ref: firstInputRef }) })), jsxRuntime.jsx(antd.Form.Item, __assign({ label: "Your job title", name: "title", rules: createRules(true, 'Your job title') }, { children: jsxRuntime.jsx(antd.Input, {}) })), jsxRuntime.jsx(antd.Form.Item, __assign({ label: "Purchase order number", name: "poNumber", rules: createRules(poNumberRequired, 'Purchase order number') }, { children: jsxRuntime.jsx(antd.Input, {}) })), taxNumberRequired && (jsxRuntime.jsx(antd.Form.Item, __assign({ name: "taxNumber", label: taxNumberLabel, rules: createRules(taxNumberRequired, taxNumberLabel) }, { children: jsxRuntime.jsx(antd.Input, {}) })))] })) })));
+        }, open: acceptBoxVisible, title: "Accept quote", width: 400 }, { children: jsxRuntime.jsxs(antd.Form, __assign({ className: "bunny-flex bunny-flex-col bunny-gap-2", form: form, layout: "vertical" }, { children: [jsxRuntime.jsx(antd.Form.Item, __assign({ label: "Your name", name: "name", rules: createRules(true, "Your name") }, { children: jsxRuntime.jsx(antd.Input, { autoFocus: true, ref: firstInputRef }) })), jsxRuntime.jsx(antd.Form.Item, __assign({ label: "Your job title", name: "title", rules: createRules(true, "Your job title") }, { children: jsxRuntime.jsx(antd.Input, {}) })), jsxRuntime.jsx(antd.Form.Item, __assign({ label: "Purchase order number", name: "poNumber", rules: createRules(poNumberRequired, "Purchase order number") }, { children: jsxRuntime.jsx(antd.Input, {}) })), taxNumberRequired && (jsxRuntime.jsx(antd.Form.Item, __assign({ name: "taxNumber", label: taxNumberLabel, rules: createRules(taxNumberRequired, taxNumberLabel) }, { children: jsxRuntime.jsx(antd.Input, {}) })))] })) })));
+};
+
+var useCurrentUserData = function () {
+    var queryClient = reactQuery.useQueryClient();
+    var token = useToken();
+    var currentUser = queryClient.getQueryData(common.QueryKeyFactory.default.currentUserKey(token));
+    if (!currentUser)
+        return {};
+    return currentUser;
 };
 
 var Title$2 = antd.Typography.Title;
@@ -19566,10 +19590,10 @@ var PaymentHoldModal = function (_a) {
     var visible = _a.visible, setVisible = _a.setVisible, quote = _a.quote;
     var queryClient = reactQuery.useQueryClient();
     var token = useToken();
-    var entityId = useCurrentUserData().entityId;
+    var account = useCurrentUserData().account;
     return (jsxRuntime.jsxs(StyledModal$1, __assign({ centered: true, onCancel: function () {
             setVisible(false);
-        }, footer: null, open: visible, width: 600 }, { children: [jsxRuntime.jsx(Title$2, __assign({ className: "mt-4 pb-4 mx-4", level: 5 }, { children: "Pay to accept" })), jsxRuntime.jsx("div", __assign({ className: "mb-4" }, { children: jsxRuntime.jsx(PaymentForm, { entityId: entityId, quote: {
+        }, footer: null, open: visible, width: 600 }, { children: [jsxRuntime.jsx(Title$2, __assign({ className: "mt-4 pb-4 mx-4", level: 5 }, { children: "Pay to accept" })), jsxRuntime.jsx("div", __assign({ className: "mb-4" }, { children: jsxRuntime.jsx(PaymentForm, { country: account === null || account === void 0 ? void 0 : account.billingCountry, quote: {
                         amount: quote.amount,
                         currencyId: quote.currency,
                         id: quote.quote.id,
@@ -19625,11 +19649,11 @@ function ActualQuote() {
     var _this = this;
     var _a, _b, _c, _d;
     // Context
-    var apiHost = react.useContext(BunnyContext).apiHost;
+    var _e = react.useContext(BunnyContext), apiHost = _e.apiHost, onTokenExpired = _e.onTokenExpired;
     var token = useToken();
-    var _e = react.useContext(InvoiceQuoteContext), className = _e.className, id = _e.id, hideDownloadButton = _e.hideDownloadButton, onQuoteLoaded = _e.onQuoteLoaded;
+    var _f = react.useContext(InvoiceQuoteContext), className = _f.className, id = _f.id, hideDownloadButton = _f.hideDownloadButton, onQuoteLoaded = _f.onQuoteLoaded;
     // Queries
-    var _f = reactQuery.useQuery({
+    var _g = reactQuery.useQuery({
         queryKey: common.QueryKeyFactory.default.createQuoteKey({ id: id, token: token }),
         queryFn: function () { return __awaiter(_this, void 0, void 0, function () {
             var error_1;
@@ -19648,14 +19672,15 @@ function ActualQuote() {
             });
         }); },
         placeholderData: reactQuery.keepPreviousData,
-    }), data = _f.data, isLoading = _f.isLoading;
+    }), data = _g.data, isLoading = _g.isLoading;
     var formattedQuote = data;
     // Hooks
-    var _g = useSendAcceptQuote({
+    var _h = useSendAcceptQuote({
         token: token,
+        onTokenExpired: onTokenExpired,
         apiHost: apiHost,
         quoteId: id,
-    }), acceptBoxVisible = _g.acceptBoxVisible, isAccepting = _g.isAccepting, sendAccept = _g.sendAccept, setAcceptBoxVisible = _g.setAcceptBoxVisible, setIsAccepting = _g.setIsAccepting, startAcceptance = _g.startAcceptance, pandadocPollingModalVisible = _g.pandadocPollingModalVisible, setPandadocPollingModalVisible = _g.setPandadocPollingModalVisible, isSendAcceptPending = _g.isSendAcceptPending;
+    }), acceptBoxVisible = _h.acceptBoxVisible, isAccepting = _h.isAccepting, sendAccept = _h.sendAccept, setAcceptBoxVisible = _h.setAcceptBoxVisible, setIsAccepting = _h.setIsAccepting, startAcceptance = _h.startAcceptance, pandadocPollingModalVisible = _h.pandadocPollingModalVisible, setPandadocPollingModalVisible = _h.setPandadocPollingModalVisible, isSendAcceptPending = _h.isSendAcceptPending;
     useSigningComplete({ data: formattedQuote, token: token });
     var isMobile = common.useIsMobile();
     var showErrorNotification = common.useErrorNotification();
@@ -19665,7 +19690,7 @@ function ActualQuote() {
         }
     }, [formattedQuote]);
     // Payment hold stuff here
-    var _h = useQuotePaymentHold(formattedQuote), paymentHoldModalVisible = _h.paymentHoldModalVisible, setPaymentHoldModalVisible = _h.setPaymentHoldModalVisible, shouldDoPaymentHold = _h.shouldDoPaymentHold, paymentHoldCompleted = _h.paymentHoldCompleted, paymentHold = _h.paymentHold;
+    var _j = useQuotePaymentHold(formattedQuote), paymentHoldModalVisible = _j.paymentHoldModalVisible, setPaymentHoldModalVisible = _j.setPaymentHoldModalVisible, shouldDoPaymentHold = _j.shouldDoPaymentHold, paymentHoldCompleted = _j.paymentHoldCompleted, paymentHold = _j.paymentHold;
     var handleClickAccept = function () {
         if (shouldDoPaymentHold && !paymentHoldCompleted) {
             setPaymentHoldModalVisible(true);
@@ -19697,14 +19722,9 @@ function QuoteButtons(_a) {
     var entityBranding = react.useContext(BrandContext);
     var downloadFile = useDownloadFile(id);
     var isExpired = useIsExpired(formattedQuote === null || formattedQuote === void 0 ? void 0 : formattedQuote.expiresAt);
-    var signingPlugins = useSigningPlugins({ apiHost: apiHost, token: token });
     return (jsxRuntime.jsxs("div", __assign({ className: "flex flex-row justify-end items-center gap-4", id: "acceptance", style: {
             color: entityBranding.secondaryColor,
-        } }, { children: [isAccepted && formattedQuote.acceptedAt ? (jsxRuntime.jsx(Text$n, { children: "Quote was accepted by ".concat(formattedQuote.acceptedByName, " on ").concat(common.formatDate(formattedQuote.acceptedAt)) })) : null, (!isMobile || !isAccepted) && (jsxRuntime.jsxs("div", __assign({ className: isMobile ? 'flex w-full justify-end gap-2' : 'flex items-center justify-end gap-2' }, { children: [paymentHold ? (jsxRuntime.jsx(PaymentHoldDisplay, { paymentHold: paymentHold, currency: formattedQuote.currency, amount: formattedQuote.amount })) : null, !isMobile && !hideDownloadButton ? (jsxRuntime.jsx(antd.Button, __assign({ icon: jsxRuntime.jsx(icons.DownloadOutlined, {}), onClick: function () { return downloadFile(apiHost + '/api/pdf/quote', token); } }, { children: "Download" }))) : null, shouldDoPaymentHold && !paymentHoldCompleted ? (jsxRuntime.jsx(antd.Button, __assign({ disabled: isExpired, onClick: function () { return setPaymentHoldModalVisible(true); }, type: "primary" }, { children: "Pay to accept" }))) : (jsxRuntime.jsx(jsxRuntime.Fragment, { children: !isAccepted ? (jsxRuntime.jsx(antd.Button, __assign({ disabled: isExpired || isAccepting, onClick: handleClickAccept, type: "primary" }, { children: isExpired
-                                ? 'Quote is expired'
-                                : (signingPlugins === null || signingPlugins === void 0 ? void 0 : signingPlugins.length)
-                                    ? 'Start signing'
-                                    : 'Accept quote' }))) : null }))] })))] })));
+        } }, { children: [isAccepted && formattedQuote.acceptedAt ? (jsxRuntime.jsx(Text$n, { children: "Quote was accepted by ".concat(formattedQuote.acceptedByName, " on ").concat(common.formatDate(formattedQuote.acceptedAt)) })) : null, (!isMobile || !isAccepted) && (jsxRuntime.jsxs("div", __assign({ className: isMobile ? 'flex w-full justify-end gap-2' : 'flex items-center justify-end gap-2' }, { children: [paymentHold ? (jsxRuntime.jsx(PaymentHoldDisplay, { paymentHold: paymentHold, currency: formattedQuote.currency, amount: formattedQuote.amount })) : null, !isMobile && !hideDownloadButton ? (jsxRuntime.jsx(antd.Button, __assign({ icon: jsxRuntime.jsx(icons.DownloadOutlined, {}), onClick: function () { return downloadFile(apiHost + '/api/pdf/quote', token); } }, { children: "Download" }))) : null, shouldDoPaymentHold && !paymentHoldCompleted ? (jsxRuntime.jsx(antd.Button, __assign({ disabled: isExpired, onClick: function () { return setPaymentHoldModalVisible(true); }, type: "primary" }, { children: "Pay to accept" }))) : (jsxRuntime.jsx(jsxRuntime.Fragment, { children: !isAccepted ? (jsxRuntime.jsx(antd.Button, __assign({ disabled: isExpired || isAccepting, onClick: handleClickAccept, type: "primary" }, { children: isExpired ? 'Quote is expired' : 'Accept quote' }))) : null }))] })))] })));
 }
 function PaymentHoldDisplay(_a) {
     var _b, _c, _d, _e;
@@ -20169,9 +20189,9 @@ function QuotesWrapper() {
     return (jsxRuntime.jsx(TransactionsDisplay, { transactions: quotesAsTransactions, onSearchValueChanged: setSearch, search: search }));
 }
 
-var MUTATION$6 = function () { return "\nmutation AccountSignup (\n  $pluginId: String!,\n  $paymentMethodId: String,\n  $priceListCode: String!,\n  $accountId: ID!,\n  $quoteId: ID!,\n) {\n  accountSignup(\n    pluginId: $pluginId,\n    paymentMethodId: $paymentMethodId,\n    priceListCode: $priceListCode,\n    accountId: $accountId,\n    quoteId: $quoteId,\n  ) {\n    errors\n    quote {\n      accountId\n      amount\n      amountDue\n      applicationDate\n      applied\n      backdatedPeriods\n      backdatedQuote\n      billingDay\n      contactId\n      createdAt\n      credits\n      currencyId\n      dealId\n      discount\n      discountValue\n      endDate\n      evergreen\n      expiresAt\n      id\n      invoiceImmediately\n      invoiceImmediatelyAvailable\n      invoiceUntil\n      isPendingApprovalRequest\n      kind\n      message\n      name\n      netPaymentDays\n      notes\n      number\n      ownerId\n      payableId\n      periodAmount\n      poNumber\n      requiresApproval\n      smallUnitAmountDue\n      splitInvoice\n      startDate\n      state\n      subtotal\n      taxAmount\n      taxCode\n      updatedAt\n      uuid\n    }\n  }\n}"; };
+var MUTATION$6 = function () { return "\nmutation AccountSignup (\n  $pluginId: String!,\n  $paymentMethodId: String,\n  $priceListCode: String!,\n  $accountId: ID!,\n  $quoteId: ID!,\n  $entityId: ID!\n) {\n  accountSignup(\n    pluginId: $pluginId,\n    paymentMethodId: $paymentMethodId,\n    priceListCode: $priceListCode,\n    accountId: $accountId,\n    quoteId: $quoteId,\n    entityId: $entityId\n  ) {\n    errors\n    quote {\n      accountId\n      amount\n      amountDue\n      applicationDate\n      applied\n      backdatedPeriods\n      backdatedQuote\n      billingDay\n      contactId\n      createdAt\n      credits\n      currencyId\n      dealId\n      discount\n      discountValue\n      endDate\n      evergreen\n      expiresAt\n      id\n      invoiceImmediately\n      invoiceImmediatelyAvailable\n      invoiceUntil\n      isPendingApprovalRequest\n      kind\n      message\n      name\n      netPaymentDays\n      notes\n      number\n      ownerId\n      payableId\n      periodAmount\n      poNumber\n      requiresApproval\n      smallUnitAmountDue\n      splitInvoice\n      startDate\n      state\n      subtotal\n      taxAmount\n      taxCode\n      updatedAt\n      uuid\n    }\n  }\n}"; };
 var accountSignup = function (_a) {
-    var token = _a.token, apiHost = _a.apiHost, accountId = _a.accountId, quoteId = _a.quoteId, paymentToken = _a.paymentToken, paymentMethodId = _a.paymentMethodId, pluginId = _a.pluginId, priceListCode = _a.priceListCode;
+    var token = _a.token, apiHost = _a.apiHost, accountId = _a.accountId, quoteId = _a.quoteId, paymentToken = _a.paymentToken, paymentMethodId = _a.paymentMethodId, pluginId = _a.pluginId, priceListCode = _a.priceListCode, entityId = _a.entityId;
     return __awaiter(void 0, void 0, void 0, function () {
         var vars, response, errors;
         var _b;
@@ -20185,6 +20205,7 @@ var accountSignup = function (_a) {
                         pluginId: pluginId,
                         paymentMethodId: paymentMethodId,
                         priceListCode: priceListCode,
+                        entityId: entityId,
                     };
                     return [4 /*yield*/, gqlRequest({
                             query: MUTATION$6(),
@@ -20203,9 +20224,9 @@ var accountSignup = function (_a) {
     });
 };
 
-var MUTATION$5 = function () { return "\nmutation QuoteAccountSignup (\n  $accountName: String!,\n  $billingContact: ContactAttributes!,\n  $priceListCode: String!,\n) {\n  quoteAccountSignup(\n    priceListCode: $priceListCode,\n    accountName: $accountName,\n    billingContact: $billingContact,\n  ) {\n    account {\n      id\n    }\n    quote {\n      accountId\n      amount\n      amountDue\n      applicationDate\n      applied\n      backdatedPeriods\n      backdatedQuote\n      billingDay\n      contactId\n      createdAt\n      credits\n      currencyId\n      dealId\n      discount\n      discountValue\n      endDate\n      evergreen\n      expiresAt\n      id\n      invoiceImmediately\n      invoiceImmediatelyAvailable\n      invoiceUntil\n      isPendingApprovalRequest\n      kind\n      message\n      name\n      netPaymentDays\n      notes\n      number\n      ownerId\n      payableId\n      periodAmount\n      poNumber\n      requiresApproval\n      smallUnitAmountDue\n      splitInvoice\n      startDate\n      state\n      subtotal\n      taxAmount\n      taxCode\n      updatedAt\n      uuid\n    }\n    tenant {\n      code\n    }\n    portalSessionToken\n    errors\n  }\n}"; };
+var MUTATION$5 = function () { return "\nmutation QuoteAccountSignup (\n  $accountName: String!,\n  $billingContact: ContactAttributes!,\n  $priceListCode: String!,\n  $entityId: ID!\n) {\n  quoteAccountSignup(\n    priceListCode: $priceListCode,\n    accountName: $accountName,\n    billingContact: $billingContact,\n    entityId: $entityId\n  ) {\n    account {\n      id\n    }\n    quote {\n      accountId\n      amount\n      amountDue\n      applicationDate\n      applied\n      backdatedPeriods\n      backdatedQuote\n      billingDay\n      contactId\n      createdAt\n      credits\n      currencyId\n      dealId\n      discount\n      discountValue\n      endDate\n      evergreen\n      expiresAt\n      id\n      invoiceImmediately\n      invoiceImmediatelyAvailable\n      invoiceUntil\n      isPendingApprovalRequest\n      kind\n      message\n      name\n      netPaymentDays\n      notes\n      number\n      ownerId\n      payableId\n      periodAmount\n      poNumber\n      requiresApproval\n      smallUnitAmountDue\n      splitInvoice\n      startDate\n      state\n      subtotal\n      taxAmount\n      taxCode\n      updatedAt\n      uuid\n    }\n    tenant {\n      code\n    }\n    portalSessionToken\n    errors\n  }\n}"; };
 var quoteAccountSignup = function (_a) {
-    var token = _a.token, apiHost = _a.apiHost, priceListCode = _a.priceListCode, accountName = _a.accountName, billingContact = _a.billingContact;
+    var token = _a.token, apiHost = _a.apiHost, priceListCode = _a.priceListCode, accountName = _a.accountName, billingContact = _a.billingContact, entityId = _a.entityId;
     return __awaiter(void 0, void 0, void 0, function () {
         var vars, response, errors;
         var _b;
@@ -20216,6 +20237,7 @@ var quoteAccountSignup = function (_a) {
                         priceListCode: priceListCode,
                         accountName: accountName,
                         billingContact: billingContact,
+                        entityId: entityId,
                     };
                     return [4 /*yield*/, gqlRequest({
                             query: MUTATION$5(),
@@ -20327,8 +20349,8 @@ var templateObject_1$6, templateObject_2$1;
 var Title$1 = antd.Typography.Title;
 function PaymentForms(_a) {
     var quote = _a.quote, handlePaymentSuccess = _a.handlePaymentSuccess, handlePaymentFail = _a.handlePaymentFail, handleSubmit = _a.handleSubmit, proceedingToPayment = _a.proceedingToPayment, accountId = _a.accountId, overrideToken = _a.overrideToken, customCheckoutFunction = _a.customCheckoutFunction;
-    var entityId = useCurrentUserData().entityId;
-    return (jsxRuntime.jsx(jsxRuntime.Fragment, { children: quote ? (jsxRuntime.jsx(jsxRuntime.Fragment, { children: overrideToken ? (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(Title$1, __assign({ className: "bunny-px-4 bunny-m-0", level: 2 }, { children: "Payment" })), jsxRuntime.jsx(PaymentForm, { entityId: entityId, onFail: handlePaymentFail, onPaymentSuccess: handlePaymentSuccess, accountId: accountId, quote: quote, overrideToken: overrideToken, customCheckoutFunction: customCheckoutFunction })] })) : null })) : (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(Title$1, __assign({ className: "bunny-px-4 bunny-m-0", level: 2 }, { children: "Signup" })), jsxRuntime.jsx(InitialSignupForm, { className: "bunny-px-4", onSubmit: handleSubmit, submitting: proceedingToPayment })] })) }));
+    var account = useCurrentUserData().account;
+    return (jsxRuntime.jsx(jsxRuntime.Fragment, { children: quote ? (jsxRuntime.jsx(jsxRuntime.Fragment, { children: overrideToken ? (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(Title$1, __assign({ className: "bunny-px-4 bunny-m-0", level: 2 }, { children: "Payment" })), jsxRuntime.jsx(PaymentForm, { country: account === null || account === void 0 ? void 0 : account.billingCountry, onFail: handlePaymentFail, onPaymentSuccess: handlePaymentSuccess, accountId: accountId, quote: quote, overrideToken: overrideToken, customCheckoutFunction: customCheckoutFunction })] })) : null })) : (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(Title$1, __assign({ className: "bunny-px-4 bunny-m-0", level: 2 }, { children: "Signup" })), jsxRuntime.jsx(InitialSignupForm, { className: "bunny-px-4", onSubmit: handleSubmit, submitting: proceedingToPayment })] })) }));
 }
 function InitialSignupForm(_a) {
     var className = _a.className, onSubmit = _a.onSubmit, submitting = _a.submitting;
@@ -20360,7 +20382,7 @@ function PriceListDisplay(_a) {
 
 var showErrorNotification = common.useErrorNotification();
 function Signup(_a) {
-    var companyName = _a.companyName, priceListCode = _a.priceListCode, returnUrl = _a.returnUrl, couponCode = _a.couponCode, className = _a.className, _b = _a.shadow, shadow = _b === void 0 ? 'shadow-md' : _b, style = _a.style;
+    var companyName = _a.companyName, priceListCode = _a.priceListCode, returnUrl = _a.returnUrl, couponCode = _a.couponCode, className = _a.className, _b = _a.shadow, shadow = _b === void 0 ? 'shadow-md' : _b, style = _a.style, entityId = _a.entityId;
     // Hooks
     var apiHost = react.useContext(BunnyContext).apiHost;
     var tokenFromContexts = useToken();
@@ -20446,6 +20468,7 @@ function Signup(_a) {
                                     lastName: formData.lastName,
                                     email: formData.email,
                                 },
+                                entityId: entityId,
                             })];
                     case 1:
                         data_1 = _a.sent();
@@ -20505,6 +20528,7 @@ function Signup(_a) {
                                 pluginId: plugin === null || plugin === void 0 ? void 0 : plugin.id.toString(),
                                 priceListCode: priceListCode,
                                 accountId: accountId,
+                                entityId: entityId,
                             })];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
@@ -20762,7 +20786,6 @@ var QuoteCheckout = function (_a) {
     var isMobile = common.useIsMobile();
     var _b = react.useState(false), isSaving = _b[0], setIsSaving = _b[1];
     var paymentRequired = getQuoteAmountDue(quote) > 0;
-    var entityId = useCurrentUserData().entityId;
     var checkoutMutation = reactQuery.useMutation({
         mutationFn: function () { return __awaiter(void 0, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -20792,7 +20815,7 @@ var QuoteCheckout = function (_a) {
     }
     if (taxationRequiredAccountFields)
         return (jsxRuntime.jsx(PaymentFormWrapper, __assign({ setMaxHeight: false }, { children: jsxRuntime.jsx(TaxationForm, { account: account, quote: quote }) })));
-    return (jsxRuntime.jsx(jsxRuntime.Fragment, { children: paymentRequired ? (jsxRuntime.jsx(PaymentForm, { entityId: entityId, onFail: onFail, onPaymentSuccess: onSuccess, quote: quote })) : (jsxRuntime.jsx(PaymentFormWrapper, __assign({ setMaxHeight: false }, { children: jsxRuntime.jsxs("div", __assign({ className: "bunny-flex bunny-flex-col bunny-gap-2 ".concat(isMobile ? 'bunny-shadow-padding-x' : '') }, { children: [jsxRuntime.jsx(antd.Button, __assign({ onClick: handleCheckoutNoPayment, type: "primary" }, { children: isSaving ? 'Processing...' : 'Complete order' })), jsxRuntime.jsx("div", __assign({ className: "bunny-text-xs bunny-text-slate-500" }, { children: "No payment is required" }))] })) }))) }));
+    return (jsxRuntime.jsx(jsxRuntime.Fragment, { children: paymentRequired ? (jsxRuntime.jsx(PaymentForm, { country: account === null || account === void 0 ? void 0 : account.billingCountry, onFail: onFail, onPaymentSuccess: onSuccess, quote: quote })) : (jsxRuntime.jsx(PaymentFormWrapper, __assign({ setMaxHeight: false }, { children: jsxRuntime.jsxs("div", __assign({ className: "bunny-flex bunny-flex-col bunny-gap-2 ".concat(isMobile ? 'bunny-shadow-padding-x' : '') }, { children: [jsxRuntime.jsx(antd.Button, __assign({ onClick: handleCheckoutNoPayment, type: "primary" }, { children: isSaving ? 'Processing...' : 'Complete order' })), jsxRuntime.jsx("div", __assign({ className: "bunny-text-xs bunny-text-slate-500" }, { children: "No payment is required" }))] })) }))) }));
 };
 var PaymentFormWrapper = function (_a) {
     var children = _a.children, setMaxHeight = _a.setMaxHeight, className = _a.className;
@@ -20812,7 +20835,6 @@ var Checkout = function (_a) {
     var onCancel = _a.onCancel, onSuccess = _a.onSuccess, onFail = _a.onFail, invoice = _a.invoice, open = _a.open, quote = _a.quote, selectedPriceList = _a.selectedPriceList, token = _a.token;
     var apiHost = react.useContext(BunnyContext).apiHost;
     var isMobile = common.useIsMobile();
-    var entityId = useCurrentUserData().entityId;
     var hasTaxPlugin = useHasTaxPlugin({
         apiHost: apiHost,
         token: token,
@@ -20884,7 +20906,7 @@ var Checkout = function (_a) {
             zIndex: 1001,
         } }, { children: jsxRuntime.jsxs("div", __assign({ className: pageWrapperClassName(isMobile) }, { children: [jsxRuntime.jsx("div", __assign({ className: "bunny-flex bunny-justify-end bunny-w-full" }, { children: jsxRuntime.jsx(icons.CloseOutlined, { className: "bunny-text-base bunny-shadow-padding-xb", onClick: onCancel }) })), jsxRuntime.jsxs("div", __assign({ className: "bunny-flex bunny-justify-end bunny-pt-4 bunny-gap-4 ".concat(isMobile ? 'bunny-flex-col' : 'bunny-shadow-padding-xb') }, { children: [((invoice === null || invoice === void 0 ? void 0 : invoice.html) || ((_b = quote === null || quote === void 0 ? void 0 : quote.formattedQuote) === null || _b === void 0 ? void 0 : _b.html)) && (jsxRuntime.jsx(InvoiceQuoteView, { html: invoice ? invoice.html : quote ? quote.formattedQuote.html : '' })), !isMobile && ((invoice === null || invoice === void 0 ? void 0 : invoice.html) || ((_c = quote === null || quote === void 0 ? void 0 : quote.formattedQuote) === null || _c === void 0 ? void 0 : _c.html)) && (jsxRuntime.jsx(antd.Divider, { className: "bunny-h-full", type: "vertical" })), invoice ? (jsxRuntime.jsx("div", __assign({ className: "bunny-w-full bunny-pt-12" }, { children: jsxRuntime.jsx(PaymentForm, { onPaymentSuccess: onSuccess, onFail: onFail, invoice: invoice }) }))) : quote ? (jsxRuntime.jsx(QuoteCheckout, { account: account, onFail: function (error) {
                                 onFail(error);
-                            }, onSuccess: onSuccess, quote: quote, taxationRequiredAccountFields: taxationRequiredAccountFields, token: token })) : (jsxRuntime.jsx(PaymentForm, { entityId: entityId, onFail: function (error) {
+                            }, onSuccess: onSuccess, quote: quote, taxationRequiredAccountFields: taxationRequiredAccountFields, token: token })) : (jsxRuntime.jsx(PaymentForm, { onFail: function (error) {
                                 onFail(error);
                             }, onPaymentSuccess: onSuccess }))] })), jsxRuntime.jsx(Footer, {})] })) })));
 };
@@ -21264,7 +21286,7 @@ var PlanPickerCheckoutBar = function (_a) {
 };
 
 // WARNING: There is a preview button on APP that will need to be changed if this query is changed
-var PRICE_LIST_CHANGE_OPTIONS_QUERY = "\n  query priceListChangeOptions($subscriptionId: ID, $productId: ID) {\n    priceListChangeOptions(subscriptionId: $subscriptionId, productId: $productId) {\n      products {\n        everythingInPlus\n        id\n        name\n        plansToDisplay\n        features(sort: \"position asc\") {\n          description\n          id\n          isVisible\n          kind\n          name\n          position\n        }\n      }\n      priceLists {\n        showPriceAsMonthly\n        basePrice\n        currencyId\n        id\n        monthlyBasePrice\n        periodMonths\n        plan {\n          code\n          contactUsLabel\n          contactUsUrl\n          description\n          id\n          name\n          position\n          pricingDescription\n          pricingStyle\n          planFeatures {\n            featureId\n            value\n            feature {\n              name\n            }\n          }\n        }\n        product {\n          id\n        }\n        charges {\n          basePrice\n          billingPeriod\n          chargeType\n          id\n          name\n          priceDecimals\n          pricingModel\n          quantityMax\n          quantityMin\n          selfServiceQuantity\n          feature {\n            name\n            unitName\n          }\n        }\n      }\n    }\n  }";
+var PRICE_LIST_CHANGE_OPTIONS_QUERY = "\n  query priceListChangeOptions($subscriptionId: ID, $productId: ID) {\n    priceListChangeOptions(subscriptionId: $subscriptionId, productId: $productId) {\n      products {\n        everythingInPlus\n        id\n        name\n        plansToDisplay\n        features(sort: \"position asc\") {\n          description\n          id\n          isVisible\n          kind\n          name\n          position\n        }\n      }\n      priceLists {\n        basePrice\n        currencyId\n        id\n        monthlyBasePrice\n        periodMonths\n        plan {\n          code\n          contactUsLabel\n          contactUsUrl\n          description\n          id\n          name\n          position\n          pricingDescription\n          pricingStyle\n          planFeatures {\n            featureId\n            value\n            feature {\n              name\n            }\n          }\n        }\n        product {\n          id\n        }\n        charges {\n          basePrice\n          billingPeriod\n          chargeType\n          id\n          name\n          priceDecimals\n          pricingModel\n          quantityMax\n          quantityMin\n          selfServiceQuantity\n          feature {\n            name\n            unitName\n          }\n        }\n      }\n    }\n  }";
 var getPriceListChangeOptions = function (_a) {
     var apiHost = _a.apiHost, isInPreviewMode = _a.isInPreviewMode, productId = _a.productId, token = _a.token, upgradingSubscription = _a.upgradingSubscription;
     return __awaiter(void 0, void 0, void 0, function () {
@@ -21368,30 +21390,10 @@ var PriceListCardTitle = function (_a) {
                     : " " }))), jsxRuntime.jsx("div", __assign({ className: "bunny-font-medium bunny-text-center ".concat(isMobile ? "bunny-text-slate-500" : "bunny-text-orange-600"), style: { fontSize: "20px" } }, { children: priceList.plan.name }))] })));
 };
 
-var getPrice = function (priceList) {
-    if (priceList.showPriceAsMonthly) {
-        return priceList.monthlyBasePrice;
-    }
-    return priceList.basePrice;
-};
-var calculatePriceDecimals = function (priceList) {
-    if (priceList.plan.pricingStyle === common.PricingStyle.PRICED) {
-        var decimalPart = getPrice(priceList).toString().split('.')[1];
-        if (!decimalPart)
-            return 0;
-        // If decimal part consists only of zeros, return 0
-        if (parseInt(decimalPart) === 0) {
-            return 0;
-        }
-        return undefined;
-    }
-    return 0;
-};
 var PriceListCardPrice = function (_a) {
     var priceList = _a.priceList;
-    var priceDecimals = calculatePriceDecimals(priceList);
     return (jsxRuntime.jsx("div", __assign({ className: "bunny-font-medium bunny-text-center bunny-text-gray-900", style: { fontSize: '32px' } }, { children: !priceList.plan.pricingStyle || priceList.plan.pricingStyle === common.PricingStyle.PRICED
-            ? common.formatCurrency(getPrice(priceList), priceList.currencyId, priceDecimals)
+            ? common.formatCurrency(priceList.monthlyBasePrice, priceList.currencyId, 0)
             : priceList.plan.pricingStyle === common.PricingStyle.CONTACT_US
                 ? ''
                 : 'Free' })));
@@ -21430,9 +21432,7 @@ var PriceListCardPriceDescription = function (_a) {
                     fontSize: isMobile ? '13px' : '12px',
                 } }, { children: priceList.plan.pricingDescription && !isEmptyHtml(priceList.plan.pricingDescription) ? (jsxRuntime.jsx(interweave.Markup, { content: priceList.plan.pricingDescription })) : ("per ".concat((feature === null || feature === void 0 ? void 0 : feature.unitName) && !doesPlanHaveFlatFeeCharges
                     ? "".concat(feature.unitName.toLowerCase(), " / ")
-                    : '').concat(priceList.showPriceAsMonthly
-                    ? 'month'
-                    : common.PERIOD_LABELS[periodMonthsConverter(priceList.periodMonths)])) })), priceList.periodMonths > 1 && (jsxRuntime.jsxs(Text$b, __assign({ className: "bunny-text-center bunny-text-gray-900", style: { fontSize: isMobile ? '12px' : '11px' } }, { children: ["billed ", BillingPeriodConverter$1[periodMonthsConverter(priceList.periodMonths)]] })))] }));
+                    : '', "month")) })), priceList.periodMonths > 1 && (jsxRuntime.jsxs(Text$b, __assign({ className: "bunny-text-center bunny-text-gray-900", style: { fontSize: isMobile ? '12px' : '11px' } }, { children: ["billed ", BillingPeriodConverter$1[periodMonthsConverter(priceList.periodMonths)]] })))] }));
 };
 
 var CheckIcon = function (_a) {
@@ -21470,11 +21470,11 @@ var PriceListCardMobile = function (_a) {
             if (!disableOnClick)
                 onClick(priceList);
         }, style: {
-            minWidth: '220px',
+            minWidth: "220px",
             borderColor: isSelected ? brandColor : common.SLATE_200,
         } }, { children: [isSelected && (jsxRuntime.jsx("div", __assign({ className: "bunny-absolute", style: {
-                    top: '10px',
-                    right: '10px',
+                    top: "10px",
+                    right: "10px",
                 } }, { children: jsxRuntime.jsx(CheckIcon, { backgroundColor: brandColor, size: "20px" }) }))), jsxRuntime.jsxs("div", __assign({ className: "bunny-flex bunny-flex-col bunny-items-center bunny-grow bunny-gap-2" }, { children: [jsxRuntime.jsxs("div", __assign({ className: "bunny-flex bunny-flex-col bunny-items-center bunny-gap-2" }, { children: [jsxRuntime.jsx(PriceListCardTitle, { isPriceListCurrentSubscription: isPriceListCurrentSubscription, priceList: priceList, trialRemainingDays: trialRemainingDays }), jsxRuntime.jsx(PriceListCardDescription, { description: description })] })), jsxRuntime.jsxs("div", __assign({ className: "bunny-flex bunny-flex-col bunny-items-center bunny-gap-2" }, { children: [jsxRuntime.jsx(PriceListCardPrice, { priceList: priceList }), jsxRuntime.jsx(PriceListCardPriceDescription, { feature: feature, priceList: priceList })] })), jsxRuntime.jsx(PriceListCardButton, { disableOnClick: disableOnClick, isPriceListCurrentSubscription: isPriceListCurrentSubscription, isSelected: isSelected, priceList: priceList, subscriptionPlan: subscriptionPlan })] }))] })));
 };
 
@@ -23293,8 +23293,8 @@ var PaymentFormSection = function (_a) {
     var onTokenExpired = react.useContext(BunnyContext).onTokenExpired;
     var handleAllErrorFormats = common.useAllErrorFormats(onTokenExpired);
     var showSuccessNotification = common.useSuccessNotification();
-    var entityId = useCurrentUserData().entityId;
-    return (jsxRuntime.jsx("div", __assign({ className: "".concat(isMobile || hideBillingDetailsForm ? 'bunny-w-full' : 'bunny-w-1/2 bunny-pt-4', " bunny-flex bunny-justify-center") }, { children: jsxRuntime.jsx(PaymentForm, { entityId: entityId, onFail: function (error) {
+    useCurrentUserData().account;
+    return (jsxRuntime.jsx("div", __assign({ className: "".concat(isMobile || hideBillingDetailsForm ? 'bunny-w-full' : 'bunny-w-1/2 bunny-pt-4', " bunny-flex bunny-justify-center") }, { children: jsxRuntime.jsx(PaymentForm, { onFail: function (error) {
                 handleAllErrorFormats(error);
             }, onSavePaymentMethod: function () {
                 showSuccessNotification('Your payment method has been saved');

package/dist/cjs/src/components/PaymentForm/PaymentForm.d.ts

@@ -1,5 +1,5 @@
 import { FormattedInvoice, PluginData, Quote } from '@bunnyapp/common';
-export declare const PaymentForm: ({ invoice, onFail, onPaymentSuccess, onPaymentHoldSuccess, quote, accountId, onSavePaymentMethod, onRemovePaymentMethod, onSetDefaultPaymentMethod, entityId, overrideToken, customCheckoutFunction, currencyId: currencyIdFromProps, paymentHoldOptions, }: {
+export declare const PaymentForm: ({ invoice, onFail, onPaymentSuccess, onPaymentHoldSuccess, quote, accountId, onSavePaymentMethod, onRemovePaymentMethod, onSetDefaultPaymentMethod, overrideToken, customCheckoutFunction, currencyId: currencyIdFromProps, paymentHoldOptions, }: {
     invoice?: FormattedInvoice | undefined;
     quote?: Quote | undefined;
     onFail: (error: any) => void;
@@ -9,7 +9,6 @@ export declare const PaymentForm: ({ invoice, onFail, onPaymentSuccess, onPaymen
     onRemovePaymentMethod?: (() => void) | undefined;
     onSetDefaultPaymentMethod?: (() => void) | undefined;
     accountId?: string | undefined;
-    entityId?: string | undefined;
     overrideToken?: string | undefined;
     customCheckoutFunction?: ((plugin: PluginData | undefined) => Promise<any>) | undefined;
     currencyId?: string | undefined;

package/dist/cjs/src/components/Quote/AcceptQuoteModal.d.ts

@@ -1,4 +1,4 @@
-import { FormattedQuote } from '@bunnyapp/common';
+import { FormattedQuote } from "@bunnyapp/common";
 declare const AcceptQuoteModal: ({ acceptBoxVisible, formattedQuote, sendAccept, setAcceptBoxVisible, setIsAccepting, isSendAcceptPending, }: {
     acceptBoxVisible: boolean;
     formattedQuote: FormattedQuote;