diff --git a/android/app/src/main/java/com/naviapp/home/dashboard/ui/compose/investmentTab/genericComposables/ActionCardComposable.kt b/android/app/src/main/java/com/naviapp/home/dashboard/ui/compose/investmentTab/genericComposables/ActionCardComposable.kt
index 5f3fa49093..bfdf6cb2bd 100644
--- a/android/app/src/main/java/com/naviapp/home/dashboard/ui/compose/investmentTab/genericComposables/ActionCardComposable.kt
+++ b/android/app/src/main/java/com/naviapp/home/dashboard/ui/compose/investmentTab/genericComposables/ActionCardComposable.kt
@@ -98,8 +98,15 @@ fun ActionCardComposable(
                         (data.properties?.actionCardProperty?.padding?.end ?: R.integer.value_16).dp
                 )
                 .clickableWithNoGesture {
-                    buttonState.value = FooterButtonState.LOADING
-                    data.actionData?.let { onHopperStart(it.toCtaData(), buttonState) }
+                    data.actionData?.let {
+                        InvestmentsScreenHelper()
+                            .setActionStatus(
+                                actionData = it,
+                                buttonState = buttonState,
+                                onClick = onClick,
+                                onHopperStart = onHopperStart
+                            )
+                    }
                 }
     }
 
@@ -241,8 +248,15 @@ fun ActionCardComposable(
                         },
                     state = buttonState.value.name,
                     onClick = { ctaData ->
-                        buttonState.value = FooterButtonState.LOADING
-                        data.actionData?.let { onHopperStart(it.toCtaData(), buttonState) }
+                        data.actionData?.let {
+                            InvestmentsScreenHelper()
+                                .setActionStatus(
+                                    actionData = it,
+                                    buttonState = buttonState,
+                                    onClick = onClick,
+                                    onHopperStart = onHopperStart
+                                )
+                        }
                     }
                 )