diff --git a/frontend/src/shared/pinia/shared.actions.ts b/frontend/src/shared/pinia/shared.actions.ts
deleted file mode 100644
index ddf2c8baf9..0000000000
--- a/frontend/src/shared/pinia/shared.actions.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import type { Contributor } from '@/modules/contributor/types/Contributor';
-import type { ReportDataType } from '@/shared/modules/report-issue/constants/report-data-type.enum';
-import type { Organization } from '@/modules/organization/types/Organization';
-
-export default {
-  /** Report Data Modal * */
-  setReportDataModal(data: {
-    type?: ReportDataType,
-    attribute?: any,
-    contributor?: Contributor,
-    organization?: Organization,
-  }) {
-    this.reportDataModal = data;
-  },
-};
diff --git a/frontend/src/shared/pinia/shared.getters.ts b/frontend/src/shared/pinia/shared.getters.ts
deleted file mode 100644
index 02a61bed5e..0000000000
--- a/frontend/src/shared/pinia/shared.getters.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export default {
-};
diff --git a/frontend/src/shared/pinia/shared.state.ts b/frontend/src/shared/pinia/shared.state.ts
deleted file mode 100644
index 76abe30025..0000000000
--- a/frontend/src/shared/pinia/shared.state.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export interface SharedState {
-  reportDataModal: any | null;
-}
-
-export default () => ({
-  reportDataModal: null,
-} as SharedState);
diff --git a/frontend/src/shared/pinia/shared.store.ts b/frontend/src/shared/pinia/shared.store.ts
index 144c9ad6ba..f2a243eb5a 100644
--- a/frontend/src/shared/pinia/shared.store.ts
+++ b/frontend/src/shared/pinia/shared.store.ts
@@ -1,13 +1,26 @@
 import { defineStore } from 'pinia';
-import state from './shared.state';
-import getters from './shared.getters';
-import actions from './shared.actions';
-
-export const useSharedStore = defineStore(
-  'shared',
-  {
-    state,
-    getters,
-    actions,
-  },
-);
+import { ref } from 'vue';
+import type { Contributor, ContributorAffiliation, ContributorIdentity } from '@/modules/contributor/types/Contributor';
+import type { Organization, OrganizationIdentity } from '@/modules/organization/types/Organization';
+import type { ReportDataType } from '@/shared/modules/report-issue/constants/report-data-type.enum';
+
+interface ReportDataModalPayload {
+  type?: ReportDataType;
+  attribute?:
+    | ContributorIdentity
+    | OrganizationIdentity
+    | Organization
+    | (Contributor['segments'][number] & { affiliations: Record<string, ContributorAffiliation[]> });
+  contributor?: Contributor;
+  organization?: Organization;
+}
+
+export const useSharedStore = defineStore('shared', () => {
+  const reportDataModal = ref<ReportDataModalPayload | null>(null);
+
+  function setReportDataModal(data: ReportDataModalPayload): void {
+    reportDataModal.value = data;
+  }
+
+  return { reportDataModal, setReportDataModal };
+});
diff --git a/frontend/typecheck-baseline.json b/frontend/typecheck-baseline.json
index 828a3964d8..1caeacfba9 100644
--- a/frontend/typecheck-baseline.json
+++ b/frontend/typecheck-baseline.json
@@ -1 +1 @@
-{ "errors": 31 }
+{ "errors": 30 }