Revert "feat(client): unify GA and add to donation" (#38001)

This reverts commit 78df306707.

client/src/components/Donation/DonationModal.js

@@ -11,11 +11,11 @@ import Heart from '../../assets/icons/Heart';
 import Cup from '../../assets/icons/Cup';
 import MinimalDonateForm from './MinimalDonateForm';
 
+import ga from '../../analytics';
 import {
   closeDonationModal,
   isDonationModalOpenSelector,
-  isBlockDonationModalSelector,
-  executeGA
+  isBlockDonationModalSelector
 } from '../../redux';
 
 import { challengeMetaSelector } from '../../templates/Challenges/redux';
@@ -36,8 +36,7 @@ const mapStateToProps = createSelector(
 const mapDispatchToProps = dispatch =>
   bindActionCreators(
     {
-      closeDonationModal,
-      executeGA
+      closeDonationModal
     },
     dispatch
   );
@@ -46,44 +45,18 @@ const propTypes = {
   activeDonors: PropTypes.number,
   block: PropTypes.string,
   closeDonationModal: PropTypes.func.isRequired,
-  executeGA: PropTypes.func,
   isBlockDonation: PropTypes.bool,
   show: PropTypes.bool
 };
 
-function DonateModal({
-  show,
-  block,
-  isBlockDonation,
-  closeDonationModal,
-  executeGA
-}) {
+function DonateModal({ show, block, isBlockDonation, closeDonationModal }) {
   const [closeLabel, setCloseLabel] = React.useState(false);
-  const handleProcessing = (duration, amount) => {
-    executeGA({
-      type: 'event',
-      data: {
-        category: 'donation',
-        action: 'Modal strip form submission',
-        label: duration,
-        value: amount
-      }
-    });
+  const showCloseBtn = () => {
     setCloseLabel(true);
   };
 
   if (show) {
-    executeGA({ type: 'modal', data: '/donation-modal' });
-    executeGA({
-      type: 'event',
-      data: {
-        category: 'Donation',
-        action: `Displayed ${
-          isBlockDonation ? 'block' : 'progress'
-        } donation modal`,
-        nonInteraction: true
-      }
-    });
+    ga.modalview('/donation-modal');
   }
 
   const donationText = (
@@ -128,7 +101,7 @@ function DonateModal({
       <Modal.Body>
         {isBlockDonation ? blockDonationText : progressDonationText}
         <Spacer />
-        <MinimalDonateForm handleProcessing={handleProcessing} />
+        <MinimalDonateForm showCloseBtn={showCloseBtn} />
         <Spacer />
         <Row>
           <Col sm={4} smOffset={4} xs={8} xsOffset={2}>