Update events to not use array syntax

This fixes the redirect bug
SumOfUs · Jun 21, 2018 · bee45b0 · bee45b0
1 parent 9e516b3
commit bee45b0
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/app/javascript/components/ExpressDonation/ExpressDonation.js b/app/javascript/components/ExpressDonation/ExpressDonation.js
@@ -67,14 +67,14 @@ export class ExpressDonation extends Component {
   }
 
   async onSuccess(data: any): any {
-    ee.emit('fundraiser:transaction_success', [data, this.props.formData]);
+    ee.emit('fundraiser:transaction_success', data, this.props.formData);
     return data;
   }
 
   async onFailure(reason: any): any {
     this.setState({ submitting: false });
     this.props.setSubmitting(false);
-    ee.emit('fundraiser:transaction_error', [reason, this.props.formData]);
+    ee.emit('fundraiser:transaction_error', reason, this.props.formData);
     return reason;
   }
 

diff --git a/app/javascript/components/Payment/Payment.js b/app/javascript/components/Payment/Payment.js
@@ -266,10 +266,11 @@ export class Payment extends Component {
       window.fbq('track', 'AddPaymentInfo', eventPayload);
     }
 
-    ee.emit('fundraiser:transaction_submitted', [
+    ee.emit(
+      'fundraiser:transaction_submitted',
       eventPayload,
-      this.props.formData,
-    ]);
+      this.props.formData
+    );
 
     $.post(
       `/api/payment/braintree/pages/${this.props.page.id}/transaction`,
@@ -289,12 +290,12 @@ export class Payment extends Component {
           : 'not_recurring',
       });
     }
-    ee.emit('fundraiser:transaction_success', [data, this.props.formData]);
+    ee.emit('fundraiser:transaction_success', data, this.props.formData);
     this.setState({ errors: [] });
   }
 
   onError(reason: any) {
-    ee.emit('fundraiser:transaction_error', [reason, this.props.formData]);
+    ee.emit('fundraiser:transaction_error', reason, this.props.formData);
     this.props.setSubmitting(false);
   }
 

diff --git a/app/javascript/member-facing/backbone/action_form.js b/app/javascript/member-facing/backbone/action_form.js
@@ -173,9 +173,13 @@ const ActionForm = Backbone.View.extend({
   },
 
   selectizeDropdowns() {
-    $(this.$el)
-      .find('.action-form__country-selector, .action-form__dropdown')
-      .selectize();
+    try {
+      $(this.$el)
+        .find('.action-form__country-selector, .action-form__dropdown')
+        .selectize();
+    } catch (e) {
+      return;
+    }
   },
 
   clearFormErrors() {

diff --git a/app/javascript/state/fundraiser/actions.js b/app/javascript/state/fundraiser/actions.js
@@ -4,12 +4,12 @@ import ee from '../../shared/pub_sub';
 import type { FundraiserAction, PaymentType } from './types';
 
 export function changeAmount(payload: ?number): FundraiserAction {
-  ee.emit('fundraiser:change_amount', [payload]);
+  ee.emit('fundraiser:change_amount', payload);
   return { type: 'change_amount', payload };
 }
 
 export function changeCurrency(payload: string): FundraiserAction {
-  ee.emit('fundraiser:change_currency', [payload]);
+  ee.emit('fundraiser:change_currency', payload);
   return { type: 'change_currency', payload };
 }
 
@@ -19,7 +19,7 @@ export function setSubmitting(payload: boolean): FundraiserAction {
 
 export function changeStep(payload: number): FundraiserAction {
   // we put it in a timeout because otherwise the event is fired before the step has switched
-  setTimeout(() => ee.emit('fundraiser:change_step', [payload]), 100);
+  setTimeout(() => ee.emit('fundraiser:change_step', payload), 100);
   return { type: 'change_step', payload };
 }