diff --git a/app/Livewire/BillingPortalPurchase.php b/app/Livewire/BillingPortalPurchase.php
index efb665d511e0..0889c2fc88a1 100644
--- a/app/Livewire/BillingPortalPurchase.php
+++ b/app/Livewire/BillingPortalPurchase.php
@@ -353,6 +353,7 @@ class BillingPortalPurchase extends Component
         $this->payment_method_id = $gateway_type_id;
 
         $this->handleBeforePaymentEvents();
+
     }
 
     /**
diff --git a/app/Services/ClientPortal/InstantPayment.php b/app/Services/ClientPortal/InstantPayment.php
index 3f329c0d8032..7ce624d5f270 100644
--- a/app/Services/ClientPortal/InstantPayment.php
+++ b/app/Services/ClientPortal/InstantPayment.php
@@ -44,6 +44,7 @@ class InstantPayment
 
     public function run()
     {
+        nlog($this->request->all());
         $is_credit_payment = false;
 
         $tokens = [];
diff --git a/resources/views/billing-portal/purchase.blade.php b/resources/views/billing-portal/purchase.blade.php
index 312a33682200..64724977c3e2 100644
--- a/resources/views/billing-portal/purchase.blade.php
+++ b/resources/views/billing-portal/purchase.blade.php
@@ -6,18 +6,19 @@
 @stop
 
 @push('footer')
+
     <script>
-        function updateGatewayFields(companyGatewayId, paymentMethodId) {
-            document.getElementById('company_gateway_id').value = companyGatewayId;
-            document.getElementById('payment_method_id').value = paymentMethodId;
-        }
 
+        document.addEventListener('livewire:init', () => {
 
-document.addEventListener('livewire:init', () => {
+            Livewire.on('beforePaymentEventsCompleted', () => {
+                setTimeout(() => {
+                    document.getElementById('payment-method-form').submit()
+                }, 2000);
+            });
 
-    Livewire.on('beforePaymentEventsCompleted', () => document.getElementById('payment-method-form').submit());
-
-});
+        });
 
     </script>
+    
 @endpush
diff --git a/resources/views/billing-portal/purchasev2.blade.php b/resources/views/billing-portal/purchasev2.blade.php
index 33883489393f..ff94394bfe2c 100644
--- a/resources/views/billing-portal/purchasev2.blade.php
+++ b/resources/views/billing-portal/purchasev2.blade.php
@@ -7,14 +7,8 @@
 
 @push('footer')
     <script>
-        function updateGatewayFields(companyGatewayId, paymentMethodId) {
-            console.log(companyGatewayId, paymentMethodId);
-        
-            document.getElementById('company_gateway_id').value = companyGatewayId;
-            document.getElementById('payment_method_id').value = paymentMethodId;
-        }
 
-        document.addEventListener('livewire:init', () => {
+document.addEventListener('livewire:init', () => {
 
             Livewire.on('beforePaymentEventsCompleted', () => {
                 setTimeout(() => {
diff --git a/resources/views/portal/ninja2020/components/livewire/billing-portal-purchase.blade.php b/resources/views/portal/ninja2020/components/livewire/billing-portal-purchase.blade.php
index deeeaf2a9246..704a98323f4b 100644
--- a/resources/views/portal/ninja2020/components/livewire/billing-portal-purchase.blade.php
+++ b/resources/views/portal/ninja2020/components/livewire/billing-portal-purchase.blade.php
@@ -143,7 +143,7 @@
                         @if($steps['started_payment'] == false)
                             @foreach($this->methods as $method)
                                 <button
-                                    wire:click="handleMethodSelectingEvent('{{ $method['company_gateway_id'] }}', '{{ $method['gateway_type_id'] }}')"
+                                    wire:click="handleMethodSelectingEvent('{{ $method['company_gateway_id'] }}', '{{ $method['gateway_type_id'] }}'); $wire.$refresh(); "
                                     class="px-3 py-2 border rounded mr-4 hover:border-blue-600">
                                     {{ $method['label'] }}
                                 </button>
diff --git a/resources/views/portal/ninja2020/subscriptions/switch.blade.php b/resources/views/portal/ninja2020/subscriptions/switch.blade.php
index 9093ebe916c1..a66d224e9db9 100644
--- a/resources/views/portal/ninja2020/subscriptions/switch.blade.php
+++ b/resources/views/portal/ninja2020/subscriptions/switch.blade.php
@@ -51,9 +51,14 @@
         
         document.addEventListener('livewire:init', () => {
 
-            Livewire.on('beforePaymentEventsCompleted', () => document.getElementById('payment-method-form').submit());
+            Livewire.on('beforePaymentEventsCompleted', () => {
+                setTimeout(() => {
+                    document.getElementById('payment-method-form').submit()
+                }, 2000);
+            });
 
         });
 
     </script>
+
 @endpush