resolving conflict and rebasing the branch

SumOfUs · Sep 7, 2018 · fa0da43 · fa0da43
2 parents ac20a1c + 3e091fa
commit fa0da43
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/app/javascript/member-facing/double_opt_in.js b/app/javascript/member-facing/double_opt_in.js
@@ -32,7 +32,7 @@ const DoubleOptIn = {
   },
 
   handleActionSuccess(resp: Response) {
-    if (!resp.double_opt_in) return;
+    if (!resp || !resp.double_opt_in) return;
 
     if (DoubleOptIn.version() === 2) {
       showNotice();

diff --git a/app/javascript/packs/fundraiser.js b/app/javascript/packs/fundraiser.js
@@ -45,7 +45,9 @@ function mount(root: string, options: any, Component?: any = FundraiserView) {
 }
 
 window.mountFundraiser = function(root: string, data: MountFundraiserOptions) {
-  const search: SearchParams = queryString.parse(location.search);
+  const search: SearchParams = queryString.parse(location.search, {
+    arrayFormat: 'bracket',
+  });
   const { personalization, page } = window.champaign;
   dispatch({
     type: 'initialize_fundraiser',

diff --git a/app/javascript/util/log_event.js b/app/javascript/util/log_event.js
@@ -30,7 +30,7 @@ const getEventData = (eventName: string, data: any) => {
     case 'set_store_in_vault':
       return [
         'fundraising',
-        'set_store_in_valut',
+        'set_store_in_vault',
         data.payload ? 'true' : 'false',
       ];
     case 'set_recurring':

diff --git a/app/views/shared/_google_analytics_snippet.slim b/app/views/shared/_google_analytics_snippet.slim
@@ -1,2 +1,2 @@
 script
-  |  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); ga('create', '#{Settings.ga_tracking_code}', 'auto'); ga('send', 'pageview');
+  |  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); ga('create', '#{Settings.ga_tracking_code}', 'auto'); ga('set', 'userId', champaign.personalization.member.actionkit_user_id); ga('send', 'pageview');