@rebilly/instruments 4.7.1 → 4.8.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rebilly/instruments",
-  "version": "4.7.1",
+  "version": "4.8.1",
   "author": "Rebilly",
   "license": "MIT",
   "main": "dist/index.js",

package/src/functions/mount/fetch-data.js

@@ -134,6 +134,13 @@ export async function fetchData({
     try {
         state.data = new DataInstance();
 
+        if (!riskMetadata) {
+            const { riskMetadata: data } = await collectData();
+            state.data.riskMetadata = data;
+        } else {
+            state.data.riskMetadata = riskMetadata;
+        }
+
         if (state.options?.deposit) {
             if (state.options.deposit.depositRequestId) {
                 state.data.deposit = await fetchDepositRequest({
@@ -156,10 +163,10 @@ export async function fetchData({
                 state.data.account = account;
                 state.data.website = website;
             });
-            readyToPayPromise = fetchReadyToPay({ riskMetadata });
+            readyToPayPromise = fetchReadyToPay();
             availableInstrumentsPromise = fetchInstruments({ state });
         } else {
-            readyToPayPromise = fetchReadyToPay({ riskMetadata });
+            readyToPayPromise = fetchReadyToPay();
         }
 
         if (state.options?.transactionId) {
@@ -183,11 +190,6 @@ export async function fetchData({
             state.data.invoice = invoice;
         }
 
-        if (!riskMetadata) {
-            ({ riskMetadata } = await collectData());
-            state.data.riskMetadata = riskMetadata;
-        }
-
         const previewPurchasePromise = state.options.items
             ? fetchSummary()
             : null;

package/src/storefront/ready-to-pay.js

@@ -55,15 +55,15 @@ export function filterReadyToPay(readyToPay) {
         .filter(({ metadata }) => metadata.storefrontEnabled);
 }
 
-export async function fetchReadyToPay({ riskMetadata = null }) {
+export async function fetchReadyToPay() {
     return Endpoint(async () => {
-        if (!riskMetadata) {
+        if (!state.data.riskMetadata) {
             const { riskMetadata: data } = await collectData();
-            riskMetadata = data;
+            state.data.riskMetadata = data;
         }
 
         const data = {
-            riskMetadata,
+            riskMetadata: state.data.riskMetadata,
         };
 
         data.websiteId = state.options?.websiteId || null;

package/src/storefront/ready-to-pay.spec.js

@@ -42,10 +42,8 @@ describe('Storefront API Ready to Pay', () => {
 
         vi.spyOn(instance.storefront.purchase, 'readyToPay');
 
-        const riskMetadata = null;
         const response = await fetchReadyToPay({
             state: instance,
-            riskMetadata,
         });
 
         expect(instance.storefront.purchase.readyToPay).toBeCalledTimes(1);
@@ -68,13 +66,11 @@ describe('Storefront API Ready to Pay', () => {
     });
 
     it('should throw errors with no options', async () => {
-        const riskMetadata = null;
-
         const noConfigOrOptionsInstance = new StorefontTestingInstance({
             options: null,
         });
         await expectConfigurationError(
-            fetchReadyToPay({ riskMetadata, state: noConfigOrOptionsInstance }),
+            fetchReadyToPay({ state: noConfigOrOptionsInstance }),
         );
     });
 });

package/src/views/amount-selector.js

@@ -36,9 +36,7 @@ export async function mountAmountSelector() {
             currency,
         };
 
-        const readyToPayUpdated = await fetchReadyToPay({
-            riskMetadata: state.data.riskMetadata,
-        });
+        const readyToPayUpdated = await fetchReadyToPay();
 
         state.data.readyToPay = readyToPayUpdated;
 

package/src/views/method-selector/get-payment-methods.spec.js

@@ -31,7 +31,7 @@ it('should only return the allowed methods', async () => {
             },
         ]),
     );
-    state.data.readyToPay = await fetchReadyToPay({});
+    state.data.readyToPay = await fetchReadyToPay();
 
     const results = getPaymentMethods();