Merge branch 'hotfix/remove-apple-google-pay' into 'main'

hotfix/remove-apple-google-pay

See merge request witapp/aura-webapp!501

src/components/PalmistryV1/components/PaymentModalV1/PaymentForm/index.tsx

@@ -10,8 +10,6 @@ import cn from "classnames";
 import { getFormattedPrice } from '@/utils/price.utils';
 import SecurityPayments from '@/components/pages/TrialPayment/components/SecurityPayments';
 import { usePayment } from '@/hooks/payment/nmi/usePayment';
-import GooglePayButton from '@/components/Payment/nmi/GooglePayButton';
-import ApplePayButton from '@/components/Payment/nmi/ApplePayButton';
 import Title from '@/components/Title';
 import metricService, { EGoals, EMetrics } from '@/services/metric/metricService';
 import { useNavigate } from 'react-router-dom';
@@ -130,8 +128,8 @@ function PaymentForm({
                         <CreditCardIcon />
                         <div>Credit / Debit Card</div>
                     </div>
-                    <GooglePayButton />
-                    <ApplePayButton />
+                    {/* <GooglePayButton />
+                    <ApplePayButton /> */}
                     <div className={styles.infoContainer}>
                         <SecurityPayments />
                         <p className={styles.address}>

src/hooks/payment/nmi/usePayment.ts

@@ -61,8 +61,8 @@ export const usePayment = ({ placementKey, activeProduct }: IUsePaymentProps) =>
                 }
             },
             price: formPrice,
-            country: "US",
-            currency: "USD",
+            // country: "US",
+            // currency: "USD",
         });
     }, [placementId, paywallId]);
 

src/utils/FBMetaPixel/index.tsx

@@ -166,19 +166,19 @@ fbq('track', 'PageView');`;
       {isPalmistry && <script>{FBScriptPalmistry2}</script>}
       {isPalmistry && <script>{FBScriptPalmistry3}</script>}
       {isPalmistry && locale === "es" && (
-        <>
         <script>{FBScriptPalmistryES1}</script>
+      )}
+      {isPalmistry && locale === "es" && (
         <script>{FBScriptPalmistryES2}</script>
-        </>
       )}
       {isPalmistry && locale?.includes("pt") && (
         <script>{FBScriptPalmistryPT1}</script>
       )}
       {isPalmistry && locale === "en" && (
-        <>
         <script>{FBScriptPalmistryEN1}</script>
+      )}
+      {isPalmistry && locale === "en" && (
         <script>{FBScriptPalmistryEN2}</script>
-        </>
       )}
       {/* Compatibility */}
       {!isPalmistry && !isChats && locale === "es" && (