Merge branch 'develop' into 'main'

develop

See merge request witapp/aura-webapp!513

src/components/pages/ABDesign/v1/pages/TrialPayment/index.tsx

@@ -72,10 +72,10 @@ function TrialPaymentPage() {
   }, [isPaymentSuccess])
 
   useEffect(() => {
-    if (isModalClosed) {
+    if (isModalClosed && !isPaymentSuccess && !isLoading) {
       return handleDiscount()
     }
-  }, [isModalClosed])
+  }, [isModalClosed, isPaymentSuccess, isLoading])
 
   useEffect(() => {
     if (error?.length && error !== "Product not found") {

src/hooks/payment/nmi/usePayment.ts

@@ -78,7 +78,6 @@ export const usePayment = ({ placementKey, activeProduct }: IUsePaymentProps) =>
 
     const finishSubmit = async (response: any) => {
         try {
-            console.log("response: ", response);
             setIsSubmitting(true);
             const res = await api.makePayment({
                 token,