diff --git a/lib/dashboard/home/tab_bar/credentials/present/pick/selective_disclosure/cubit/selective_disclosure_pick_cubit.dart b/lib/dashboard/home/tab_bar/credentials/present/pick/selective_disclosure/cubit/selective_disclosure_pick_cubit.dart
index 408ed9b32..2f6d3141d 100644
--- a/lib/dashboard/home/tab_bar/credentials/present/pick/selective_disclosure/cubit/selective_disclosure_pick_cubit.dart
+++ b/lib/dashboard/home/tab_bar/credentials/present/pick/selective_disclosure/cubit/selective_disclosure_pick_cubit.dart
@@ -1,5 +1,3 @@
-import 'dart:convert';
-
 import 'package:altme/app/shared/shared.dart';
 import 'package:altme/dashboard/home/home.dart';
 import 'package:altme/selective_disclosure/selective_disclosure.dart';
diff --git a/lib/dashboard/home/tab_bar/credentials/present/pick/selective_disclosure/view/selective_disclosure_pick_page.dart b/lib/dashboard/home/tab_bar/credentials/present/pick/selective_disclosure/view/selective_disclosure_pick_page.dart
index 86ae182e0..e738ebf3d 100644
--- a/lib/dashboard/home/tab_bar/credentials/present/pick/selective_disclosure/view/selective_disclosure_pick_page.dart
+++ b/lib/dashboard/home/tab_bar/credentials/present/pick/selective_disclosure/view/selective_disclosure_pick_page.dart
@@ -5,7 +5,7 @@ import 'package:altme/dashboard/dashboard.dart';
 import 'package:altme/l10n/l10n.dart';
 import 'package:altme/scan/cubit/scan_cubit.dart';
 import 'package:altme/selective_disclosure/selective_disclosure.dart';
-import 'package:altme/selective_disclosure/widget/display_selective_disclosure.dart';
+import 'package:altme/selective_disclosure/widget/inject_selective_disclosure_state.dart';
 import 'package:credential_manifest/credential_manifest.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -115,8 +115,8 @@ class _SelectiveDisclosurePickViewState
           );
         }
       },
-      child: BlocBuilder<SelectiveDisclosureCubit, SelectiveDisclosureState>(
-        builder: (context, state) {
+      child: Builder(
+        builder: (BuildContext context) {
           final profileSetting =
               context.read<ProfileCubit>().state.model.profileSetting;
 
@@ -143,10 +143,8 @@ class _SelectiveDisclosurePickViewState
                     isDiscover: false,
                   ),
                 const SizedBox(height: 20),
-                DisplaySelectiveDisclosure(
+                ConsumeSelectiveDisclosureCubit(
                   credentialModel: widget.credentialToBePresented,
-                  claims: null,
-                  selectiveDisclosureState: state,
                   onPressed: (claimKey, claimKeyId, threeDotValue) {
                     context.read<SelectiveDisclosureCubit>().disclosureAction(
                           claimsKey: claimKey,
@@ -164,13 +162,18 @@ class _SelectiveDisclosurePickViewState
                 padding: const EdgeInsets.all(16),
                 child: Tooltip(
                   message: l10n.credentialPickPresent,
-                  child: MyGradientButton(
-                    onPressed: () => present(
-                      context: context,
-                      selectedSDIndexInJWT: state.selectedSDIndexInJWT,
-                      uri: widget.uri,
-                    ),
-                    text: l10n.credentialPickPresent,
+                  child: BlocBuilder<SelectiveDisclosureCubit,
+                      SelectiveDisclosureState>(
+                    builder: (context, state) {
+                      return MyGradientButton(
+                        onPressed: () => present(
+                          context: context,
+                          selectedSDIndexInJWT: state.selectedSDIndexInJWT,
+                          uri: widget.uri,
+                        ),
+                        text: l10n.credentialPickPresent,
+                      );
+                    },
                   ),
                 ),
               ),
diff --git a/lib/selective_disclosure/widget/inject_selective_disclosure_state.dart b/lib/selective_disclosure/widget/inject_selective_disclosure_state.dart
new file mode 100644
index 000000000..d8a040d9e
--- /dev/null
+++ b/lib/selective_disclosure/widget/inject_selective_disclosure_state.dart
@@ -0,0 +1,34 @@
+import 'package:altme/dashboard/dashboard.dart';
+import 'package:altme/selective_disclosure/widget/display_selective_disclosure.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+class ConsumeSelectiveDisclosureCubit extends StatelessWidget {
+  const ConsumeSelectiveDisclosureCubit({
+    super.key,
+    required this.credentialModel,
+    required this.showVertically,
+    this.onPressed,
+    this.parentKeyId,
+  });
+
+  final CredentialModel credentialModel;
+  final bool showVertically;
+  final void Function(String?, String, String?)? onPressed;
+
+  final String? parentKeyId;
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocBuilder<SelectiveDisclosureCubit, SelectiveDisclosureState>(
+      builder: (context, state) {
+        return DisplaySelectiveDisclosure(
+          credentialModel: credentialModel,
+          selectiveDisclosureState: state,
+          onPressed: onPressed,
+          showVertically: true,
+        );
+      },
+    );
+  }
+}