@rebilly/instruments 3.23.0-beta.0 → 3.24.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rebilly/instruments",
-  "version": "3.23.0-beta.0",
+  "version": "3.24.0-beta.0",
   "author": "Rebilly",
   "license": "MIT",
   "main": "dist/index.js",
@@ -17,7 +17,6 @@
     "@babel/core": "^7.14.6",
     "@babel/preset-env": "^7.14.7",
     "@rebilly/risk-data-collector": "^2.3.0",
-    "@vue-reactivity/watch": "^0.2.0",
     "@vue/reactivity": "^3.2.39",
     "jwt-decode": "^3.1.2",
     "lodash.camelcase": "^4.3.0",

package/src/functions/purchase.js

@@ -111,7 +111,7 @@ export function handleApprovalUrl({fields, payload}) {
       model.purchase = fields;
     }
   
-    state.data = new DataInstance({state, ...fields});
+    state.data = new DataInstance({...fields});
   
     mountModal({
       state,

package/src/state/index.js

@@ -18,12 +18,13 @@ export default (() => {
     toModel() {
       const model = {
         ...state,
-        data: state.data.toPostmatesMode ? state.data.toPostmatesModel() : {},
+        data: state.data.toPostmatesModel ? state.data.toPostmatesModel() : {},
       };
       
       // remove functions from model
       delete model.toModel;
       delete model.updateModel;
+      delete model.reset;
 
       return JSON.parse(JSON.stringify(model));
     },

package/src/views/common/iframe/modal-iframe.js

@@ -1,4 +1,5 @@
 import BaseIframe from './base-iframe';
+import state from '../../../state';
 
 import { changeIframeSrcHandler } from './events/change-iframe-src-handler';
 import { resizeComponentHandler } from './events/resize-component-handler';
@@ -30,36 +31,36 @@ export class ModalIframe extends BaseIframe {
     // Close modal via postMessage (specifically during approval url flow)
     window.addEventListener('message', async (event) => {
       if(event.data === 'rebilly-instruments-approval-url-close') {
-        if (this.state.options.transactionType === 'purchase') {
-          this.state.storefront.setSessionToken(this.state.data.token || this.state.options.jwt);
+        if (state.options.transactionType === 'purchase') {
+          state.storefront.setSessionToken(state.data.token || state.options.jwt);
 
           const [
             {fields: transaction},
             {fields: invoice}
           ] = await Promise.all([
-            this.state.storefront.transactions.get({id: this.state.data.transaction.id}),
-            this.state.data.invoice?.id
-              ? this.state.storefront.invoices.get({id: this.state.data.invoice.id})
+            state.storefront.transactions.get({id: state.data.transaction.id}),
+            state.data.invoice?.id
+              ? state.storefront.invoices.get({id: state.data.invoice.id})
               : {fields: null}
           ]);
           
           const updatedPurchase = {
-            orderId: this.state.data.orderId,
-            token: this.state.data.token,
+            orderId: state.data.orderId,
+            token: state.data.token,
             transaction,
           };
           if (invoice) {
             updatedPurchase.invoice = invoice;
           }
           close(updatedPurchase);
-        } else if (this.state.options.transactionType === 'setup') {
-          this.state.storefront.setSessionToken(this.state.data.instrument.token || this.state.options.jwt);
+        } else if (state.options.transactionType === 'setup') {
+          state.storefront.setSessionToken(state.data.instrument.token || state.options.jwt);
           const {
             fields: transaction
-          } = await this.state.storefront.transactions.get({id: this.state.data.transaction.id});
+          } = await state.storefront.transactions.get({id: state.data.transaction.id});
           close({
             transaction,
-            instrument: this.state.data.instrument
+            instrument: state.data.instrument
           });
         } else {
           close();

package/src/views/method-selector/index.js

@@ -82,11 +82,11 @@ export async function mountMethodSelector() {
     iframe.bindEventListeners({loader: state.loader});
 
     iframe.component.on(`${name}-confirm-purchase`, (confirmedInstrument) => {
-      purchase({ state, payload: confirmedInstrument });
+      purchase({ payload: confirmedInstrument });
     });
 
     iframe.component.on(`${name}-confirm-setup`, (confirmedInstrument) => {
-      setup({ state, payload: confirmedInstrument });
+      setup({ payload: confirmedInstrument });
     });
 
     iframe.component.on('choose-another-method', () => {