fixes part 5

resources/js/components/Admin/WidgetLatestTransactions.vue

@@ -51,9 +51,9 @@
                     </span>
                 </td>
                 <td class="pl-3 md:pl-1">
-                    <div class="w-32 text-right md:w-full">
+                    <div class="w-28">
                         <img
-                            class="w-32 md:inline-block"
+                            class="inline-block max-h-5"
                             :src="$getPaymentLogo(row.data.attributes.driver)"
                             :alt="row.data.attributes.driver"
                         />

resources/js/components/Others/SelectSingleChargeMethodPopup.vue

@@ -47,7 +47,7 @@
                     :email="user.data.attributes.email"
                     :paystackkey="config.paystack_public_key"
                     :reference="$generatePaystackReference()"
-                    :callback="paystackPaymentSuccessful"
+                    :callback="paymentSuccessful"
                     :close="paystackClosed"
                 >
                     <span class="text-theme cursor-pointer text-sm font-bold">
@@ -132,8 +132,9 @@ export default {
 
             this.paypal.isMethodsLoaded = true
             this.paypal.isMethodLoading = false
+			const app = this
 
-            // Initialize paypal buttons for single charge
+			// Initialize paypal buttons for single charge
             await paypal
                 .Buttons({
                     createOrder: function (data, actions) {
@@ -148,10 +149,13 @@ export default {
                             ],
                         })
                     },
+					onApprove: function () {
+						app.paymentSuccessful()
+					},
                 })
                 .render('#paypal-button-container')
         },
-        paystackPaymentSuccessful() {
+        paymentSuccessful() {
             this.$closePopup()
 
             events.$emit('toaster', {

resources/js/components/Spotlight/Spotlight.vue

@@ -227,7 +227,9 @@
 
                         <!--Keyboard shortcut hint-->
                         <div v-if="!$isMobile()" class="absolute right-4 top-1/2 -translate-y-1/2 transform">
-                            <span class="text-xs text-gray-400">{{ i === 0 ? '↵' : metaKeyIcon + i }}</span>
+                            <span class="text-xs text-gray-400">
+								{{ i === 0 ? '↵' : metaKeyIcon + i }}
+							</span>
                         </div>
                     </div>
                 </div>

resources/js/components/Subscription/SelectPlanSubscriptionPopup.vue

@@ -92,7 +92,7 @@
                 </InfoBox>
 
                 <!--Toggle yearly billing-->
-                <div v-if="hasYearlyPlans.length > 0" class="mb-2 px-5 text-right">
+                <div v-if="hasYearlyPlans.length > 0" class="mb-2 text-right">
                     <label
                         :class="{ 'text-gray-400': !isSelectedYearlyPlans }"
                         class="cursor-pointer text-xs font-bold"
@@ -130,7 +130,7 @@
                 </ButtonBase>
                 <ButtonBase
                     class="w-full"
-                    v-if="plans.data.length !== 0"
+                    v-if="plans && plans.data.length !== 0"
                     :button-style="buttonStyle"
                     @click.native="isPaymentOptionPage = true"
                     >{{ $t('Upgrade Account') }}
@@ -254,7 +254,7 @@ export default {
                             custom_id: userId,
                         })
                     },
-                    onApprove: function (data, actions) {
+                    onApprove: function () {
                         app.paymentSuccessful()
                     },
                 })