From 6302f60de25a677b3b31dabd581799bcce549f8c Mon Sep 17 00:00:00 2001
From: tnagorra <weathermist@gmail.com>
Date: Wed, 19 Jan 2022 10:02:19 +0545
Subject: [PATCH] WIP

---
 .eslintrc.js                                  |   3 +
 app/Base/components/Navbar/index.tsx          |   2 +-
 app/Base/index.tsx                            |  11 +-
 app/Base/utils/apollo.ts                      |   2 +-
 app/Base/utils/common.ts                      |  14 ++
 app/Base/utils/restRequest.ts                 |  10 +-
 .../GeoLocationMapInput/index.tsx             |  21 ++-
 app/components/NonFieldError/index.tsx        |   2 +-
 .../NotificationContainer/index.tsx           |   4 +-
 .../ProjectJoinRequestItem/index.tsx          |  14 +-
 .../Notifications/NotificationItem/index.tsx  | 130 +++++++++---------
 app/components/OrganigramInput/index.tsx      |   4 +-
 app/components/RechartsLegend/index.tsx       |   2 +-
 app/components/Screenshot/index.tsx           |  18 +--
 app/components/SortableList/index.tsx         |  14 +-
 app/components/TreeSelection/index.tsx        |   7 -
 app/components/entry/CompactSection/index.tsx |   6 +-
 .../entryReview/EntryCommentWrapper/index.tsx |   4 +-
 .../EntryComments/Comment/index.tsx           |   6 +-
 .../Matrix1dWidgetInput/index.tsx             |   8 +-
 .../Matrix2dWidgetInput/index.tsx             |  16 +--
 .../MultiSelectWidgetInput/index.tsx          |   2 +-
 .../AttributeInput/ScaleWidgetInput/index.tsx |   6 +-
 .../SingleSelectWidgetInput/index.tsx         |   2 +-
 .../DateRangeWidgetInput/index.tsx            |   4 +-
 .../GeoLocationWidgetInput/index.tsx          |   2 +-
 .../Matrix1dWidgetInput/index.tsx             |   8 +-
 .../Matrix2dWidgetInput/index.tsx             |  14 +-
 .../MultiSelectWidgetInput/index.tsx          |   4 +-
 .../OrganigramWidgetInput/index.tsx           |   2 +-
 .../ScaleWidgetInput/index.tsx                |   6 +-
 .../SingleSelectWidgetInput/index.tsx         |   2 +-
 .../TimeRangeWidgetInput/index.tsx            |   4 +-
 .../general/AddLeadGroupModal/index.tsx       |   4 +-
 .../general/AddOrganizationModal/index.tsx    |   8 +-
 .../general/AddStakeholderModal/index.tsx     |   2 +-
 .../lead/LeadInput/EmmStats/index.tsx         |   8 +-
 app/components/lead/LeadPreview/index.tsx     |   4 +-
 app/components/region/RegionMap/index.tsx     |   6 +-
 app/translate/index.tsx                       |  10 +-
 app/types/newAnalyticalFramework.ts           |   8 +-
 app/utils/browserExtension.tsx                |  27 ++--
 .../PrimaryTagging/index.tsx                  |   6 +-
 .../AnalyticalFramework/UserTable/index.tsx   |  14 +-
 .../components/Canvas/index.tsx               |   4 +-
 .../DateConditionalWidgetForm/index.tsx       |   8 +-
 .../DateRangeConditionalWidgetForm/index.tsx  |   8 +-
 .../index.tsx                                 |   8 +-
 .../Matrix1dConditionalWidgetForm/index.tsx   |   8 +-
 .../Matrix2dConditionalWidgetForm/index.tsx   |   8 +-
 .../index.tsx                                 |   8 +-
 .../NumberConditionalWidgetForm/index.tsx     |   8 +-
 .../OrganigramConditionalWidgetForm/index.tsx |   8 +-
 .../ScaleConditionalWidgetForm/index.tsx      |   8 +-
 .../index.tsx                                 |   8 +-
 .../TextConditionalWidgetForm/index.tsx       |   8 +-
 .../TimeConditionalWidgetForm/index.tsx       |   8 +-
 .../TimeRangeConditionalWidgetForm/index.tsx  |   8 +-
 .../OrganigramWidgetForm/index.tsx            |  20 +--
 app/views/AnalyticalFramework/index.tsx       |  14 +-
 app/views/AnalyticalFramework/utils.ts        |  14 +-
 .../ActionCell/ProjectJoinModal/index.tsx     |   2 +-
 .../ExploreDeep/MapView/ProjectList/index.tsx |  22 +--
 app/views/ExploreDeep/MapView/index.tsx       |   4 +-
 .../ExploreDeep/ProjectFilterForm/index.tsx   |  10 +-
 .../PublicMapView/ProjectList/index.tsx       |  18 +--
 app/views/ExploreDeep/PublicMapView/index.tsx |   4 +-
 .../ExploreDeep/PublicTableView/index.tsx     |  12 +-
 app/views/ExploreDeep/TableView/index.tsx     |  20 +--
 app/views/ExploreDeep/index.tsx               |   4 +-
 .../ForgotPasswordForm/index.tsx              |   2 +-
 .../Home/Assignment/AssignmentItem/index.tsx  |   8 +-
 app/views/Home/ProjectItem/index.tsx          |   2 +-
 app/views/Login/LoginForm/index.tsx           |   8 +-
 .../MyProfile/ChangePasswordModal/index.tsx   |   2 +-
 .../Analysis/AnalysisCloneModal/index.tsx     |   2 +-
 .../Analysis/AnalysisPillar/index.tsx         |   2 +-
 .../Analysis/PillarList/index.tsx             |   2 +-
 .../Project/AnalysisModule/Analysis/index.tsx |   2 +-
 .../AnalysisEditModal/index.tsx               |   6 +-
 app/views/Project/AnalysisModule/index.tsx    |  10 +-
 .../EntryEdit/LeftPane/EntryItem/index.tsx    |   2 +-
 .../Project/EntryEdit/LeftPane/index.tsx      |  14 +-
 app/views/Project/EntryEdit/index.tsx         |  43 +++---
 .../AnalyticalNGramsModal/index.tsx           |   2 +-
 .../AnalyticalStatementInput/index.tsx        |   2 +-
 .../DiscardedEntries/DiscardedEntry/index.tsx |   4 +-
 .../PillarAnalysis/DiscardedEntries/index.tsx |   2 +-
 .../PillarAnalysis/SourceEntryItem/index.tsx  |   4 +-
 app/views/Project/PillarAnalysis/index.tsx    |  14 +-
 .../Tagging/Assessments/ActionCell/index.tsx  |   2 +-
 .../AssessmentFilterForm/index.tsx            |   6 +-
 .../Project/Tagging/Assessments/index.tsx     |   8 +-
 .../VisualizationShareModal/index.tsx         |   8 +-
 app/views/Project/Tagging/Dashboard/index.tsx |   6 +-
 .../AssessmentsExportSelection/index.tsx      |   6 +-
 .../Export/EntriesExportSelection/index.tsx   |  13 +-
 .../Tagging/Export/ExportHistory/index.tsx    |   2 +-
 .../Tagging/Export/ExportPreview/index.tsx    |   2 +-
 .../Tagging/Export/LeadsSelection/index.tsx   |   6 +-
 app/views/Project/Tagging/Export/utils.ts     |   4 +-
 .../Tagging/LeadGroups/ActionCell/index.tsx   |   2 +-
 .../LeadGroups/LeadGroupFilterForm/index.tsx  |   6 +-
 .../Project/Tagging/LeadGroups/index.tsx      |   8 +-
 .../DropboxPicker/index.tsx                   |   2 +-
 .../Tagging/Sources/BulkUpload/index.tsx      |  14 +-
 .../Sources/EntriesGrid/EntryCard/index.tsx   |   4 +-
 .../Tagging/Sources/EntriesGrid/index.tsx     |   4 +-
 .../Tagging/Sources/LeadEditModal/index.tsx   |  18 +--
 .../EntryFilter/FrameworkFilterItem/index.tsx |  24 ++--
 .../SourcesFilter/EntryFilter/index.tsx       |   4 +-
 .../Tagging/Sources/SourcesFilter/index.tsx   |   4 +-
 .../SourcesTable/BulkActions/index.tsx        |   4 +-
 .../Sources/SourcesTable/EntryList/index.tsx  |   6 +-
 .../SourcesTable/LeadCopyModal/index.tsx      |   8 +-
 .../Tagging/Sources/SourcesTable/index.tsx    |   4 +-
 .../components/EditableEntry/index.tsx        |   2 +-
 .../Framework/FrameworkDetail/index.tsx       |  30 ++--
 .../ProjectEdit/GeoAreas/RegionsMap/index.tsx |   6 +-
 .../ProjectEdit/ProjectDetailsForm/index.tsx  |  18 +--
 .../ProjectEdit/Users/UserGroupList/index.tsx |   4 +-
 .../Users/UserList/AddUserModal/index.tsx     |   4 +-
 .../ProjectEdit/Users/UserList/index.tsx      |   6 +-
 app/views/ProjectEdit/Users/index.tsx         |   4 +-
 app/views/Register/RegisterForm/index.tsx     |  10 +-
 .../UserGroupItem/AddUserModal/index.tsx      |   2 +-
 app/views/UserGroup/UserGroupItem/index.tsx   |   2 +-
 app/views/UserGroup/index.tsx                 |   4 +-
 tsconfig.json                                 |   3 +
 129 files changed, 560 insertions(+), 546 deletions(-)
 create mode 100644 app/Base/utils/common.ts

diff --git a/.eslintrc.js b/.eslintrc.js
index 214ecd86af..e60712ad57 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -35,6 +35,7 @@ const config = {
         },
         sourceType: 'module',
         allowImportExportEverywhere: true,
+        project: ['tsconfig.json'],
     },
     rules: {
         strict: 1,
@@ -53,6 +54,8 @@ const config = {
         '@typescript-eslint/explicit-function-return-type': 0,
         '@typescript-eslint/explicit-module-boundary-types': 0,
 
+        '@typescript-eslint/no-unnecessary-condition': 'warn',
+
         'no-console': 1,
         indent: ['error', 4, { SwitchCase: 1 }],
 
diff --git a/app/Base/components/Navbar/index.tsx b/app/Base/components/Navbar/index.tsx
index 98072fae3d..7d5778c390 100644
--- a/app/Base/components/Navbar/index.tsx
+++ b/app/Base/components/Navbar/index.tsx
@@ -118,7 +118,7 @@ function Navbar(props: Props) {
 
     const notificationsCount = notifications?.notifications?.totalCount;
     const handleCloseNotificationClick = useCallback(() => {
-        notificationRef?.current?.setShowPopup(false);
+        notificationRef.current?.setShowPopup(false);
     }, []);
 
     return (
diff --git a/app/Base/index.tsx b/app/Base/index.tsx
index cdfd090bb8..9aebb333c5 100644
--- a/app/Base/index.tsx
+++ b/app/Base/index.tsx
@@ -33,6 +33,7 @@ import {
 } from '#base/utils/restRequest';
 import 'mapbox-gl/dist/mapbox-gl.css';
 
+import { find } from '#base/utils/common';
 import localforageInstance from '#base/configs/localforage';
 import { mapboxToken } from '#base/configs/env';
 
@@ -119,7 +120,7 @@ function Base() {
             setAlerts((prevAlerts) => unique(
                 [...prevAlerts, alert],
                 (a) => a.name,
-            ) ?? prevAlerts);
+            ));
         },
         [setAlerts],
     );
@@ -144,18 +145,18 @@ function Base() {
     const updateAlertContent = React.useCallback(
         (name: string, children: React.ReactNode) => {
             setAlerts((prevAlerts) => {
-                const i = prevAlerts.findIndex((a) => a.name === name);
-                if (i === -1) {
+                const prevAlert = find(prevAlerts, (a) => a.name === name);
+                if (prevAlert.index === undefined) {
                     return prevAlerts;
                 }
 
                 const updatedAlert = {
-                    ...prevAlerts[i],
+                    ...prevAlert.value,
                     children,
                 };
 
                 const newAlerts = [...prevAlerts];
-                newAlerts.splice(i, 1, updatedAlert);
+                newAlerts.splice(prevAlert.index, 1, updatedAlert);
 
                 return newAlerts;
             });
diff --git a/app/Base/utils/apollo.ts b/app/Base/utils/apollo.ts
index 8c28ad43bf..96c9e012ec 100644
--- a/app/Base/utils/apollo.ts
+++ b/app/Base/utils/apollo.ts
@@ -6,7 +6,7 @@ export function isArrayEqual<T>(foo: readonly T[], bar: T[]) {
 
 export function checkErrorCode(errors: ApolloError['graphQLErrors'], path: (string | number)[], code: string) {
     return errors.some((error) => (
-        error.path && error.extensions?.code
+        error.path && error.extensions.code
         && isArrayEqual(error.path, path) && code === error.extensions.code
     ));
 }
diff --git a/app/Base/utils/common.ts b/app/Base/utils/common.ts
new file mode 100644
index 0000000000..6226f7f05f
--- /dev/null
+++ b/app/Base/utils/common.ts
@@ -0,0 +1,14 @@
+// eslint-disable-next-line import/prefer-default-export
+export function find<T>(list: T[], selector: (value: T, index: number, obj: T[]) => boolean) {
+    const index = list.findIndex(selector);
+    if (index === -1) {
+        return {
+            index: undefined,
+            value: undefined,
+        };
+    }
+    return {
+        index,
+        value: list[index] as T,
+    };
+}
diff --git a/app/Base/utils/restRequest.ts b/app/Base/utils/restRequest.ts
index afa7548993..2485fb2112 100644
--- a/app/Base/utils/restRequest.ts
+++ b/app/Base/utils/restRequest.ts
@@ -45,9 +45,9 @@ type FormDataCompatibleObj = Record<string, Literal | Literal[] | null | undefin
 
 function getFormData(jsonData: FormDataCompatibleObj) {
     const formData = new FormData();
-    Object.keys(jsonData || {}).forEach(
+    Object.keys(jsonData).forEach(
         (key) => {
-            const value = jsonData?.[key];
+            const value = jsonData[key];
             if (value && Array.isArray(value)) {
                 value.forEach((v) => {
                     formData.append(key, v instanceof Blob ? v : String(v));
@@ -179,9 +179,7 @@ export const processDeepOptions: DeepContextInterface['transformOptions'] = (
         const csrftoken = getCookie(`deep-${deepEnvironment}-csrftoken`);
 
         finalOptions.credentials = 'include';
-        if (finalOptions.headers) {
-            finalOptions.headers['X-CSRFToken'] = csrftoken;
-        }
+        finalOptions.headers['X-CSRFToken'] = csrftoken;
     }
 
     return finalOptions;
@@ -251,7 +249,7 @@ export const processDeepError = (
         const faramErrors = alterResponse(res.errors);
 
         const messageForNotification = (
-            faramErrors?.$internal
+            faramErrors.$internal
             ?? 'Some error occurred while performing this action.'
         );
 
diff --git a/app/components/GeoLocationInput/GeoLocationModal/GeoLocationMapInput/index.tsx b/app/components/GeoLocationInput/GeoLocationModal/GeoLocationMapInput/index.tsx
index 94b5a42c20..a0f0f26b7c 100644
--- a/app/components/GeoLocationInput/GeoLocationModal/GeoLocationMapInput/index.tsx
+++ b/app/components/GeoLocationInput/GeoLocationModal/GeoLocationMapInput/index.tsx
@@ -97,13 +97,24 @@ function GeoLocationMapInput(props: Props) {
             skip: !projectId,
             variables,
             onCompleted: (data) => {
-                const [topRegion] = data.project?.regions?.filter(
+                if (!data.project?.regions) {
+                    return;
+                }
+
+                const regions = data.project.regions.filter(
                     (region) => region.isPublished,
-                ) ?? [];
-                const topAdminLevel = topRegion?.adminLevels?.find((v) => v.level === 0)
-                    ?? topRegion?.adminLevels?.[0];
+                );
+                const topRegion = regions[0];
+                if (!topRegion) {
+                    // eslint-disable-next-line no-console
+                    console.error('There must be at least on region');
+                    return;
+                }
+
+                const topAdminLevel = topRegion.adminLevels?.find((v) => v.level === 0)
+                    ?? topRegion.adminLevels?.[0];
 
-                setSelectedRegion(topRegion?.id);
+                setSelectedRegion(topRegion.id);
                 setActiveAdminLevel(topAdminLevel?.id);
             },
         },
diff --git a/app/components/NonFieldError/index.tsx b/app/components/NonFieldError/index.tsx
index e8486fac01..62ca13b94a 100644
--- a/app/components/NonFieldError/index.tsx
+++ b/app/components/NonFieldError/index.tsx
@@ -29,7 +29,7 @@ function NonFieldError(props: Props) {
         );
     }
 
-    const internalError = error?.[internal];
+    const internalError = error[internal];
 
     if (!internalError) {
         return null;
diff --git a/app/components/Notifications/NotificationContainer/index.tsx b/app/components/Notifications/NotificationContainer/index.tsx
index 2454c7bfd2..85809cf917 100644
--- a/app/components/Notifications/NotificationContainer/index.tsx
+++ b/app/components/Notifications/NotificationContainer/index.tsx
@@ -93,8 +93,8 @@ function NotificationContainer(props: Props) {
         {
             refetchQueries: ['UserNotificationsCount'],
             onCompleted: (response) => {
-                if (response?.notificationStatusUpdate?.ok) {
-                    const newStatus = response.notificationStatusUpdate?.result?.statusDisplay;
+                if (response.notificationStatusUpdate?.ok) {
+                    const newStatus = response.notificationStatusUpdate.result?.statusDisplay;
                     alert.show(
                         `Successfully updated notification status as ${newStatus?.toLowerCase() ?? 'required'}.`,
                         {
diff --git a/app/components/Notifications/NotificationItem/ProjectJoinRequestItem/index.tsx b/app/components/Notifications/NotificationItem/ProjectJoinRequestItem/index.tsx
index 308a737bd3..60831fa582 100644
--- a/app/components/Notifications/NotificationItem/ProjectJoinRequestItem/index.tsx
+++ b/app/components/Notifications/NotificationItem/ProjectJoinRequestItem/index.tsx
@@ -68,8 +68,8 @@ function ProjectJoinRequestItem(props: Props) {
         {
             refetchQueries: ['UserNotificationsCount'],
             onCompleted: (response) => {
-                if (response?.project?.acceptRejectProject?.ok) {
-                    const status = response.project.acceptRejectProject?.result?.status;
+                if (response.project?.acceptRejectProject?.ok) {
+                    const status = response.project.acceptRejectProject.result?.status;
                     alert.show(
                         status === 'ACCEPTED'
                             ? 'Successfully added user to the project.'
@@ -129,20 +129,20 @@ function ProjectJoinRequestItem(props: Props) {
         <NotificationContainer
             className={_cs(className, styles.projectJoinItem)}
             notification={notification}
-            userName={data?.requested_by?.display_name}
+            userName={data.requested_by.display_name}
             descriptionLabel="Reason"
-            description={data?.reason}
+            description={data.reason}
             pendingRequests={loading}
             content={
                 generateString(
                     '{requestorName} requested to join the project {projectTitle}.',
                     {
-                        requestorName: (<b>{data?.requested_by?.display_name}</b>),
-                        projectTitle: (<b>{data?.project?.title}</b>),
+                        requestorName: (<b>{data.requested_by.display_name}</b>),
+                        projectTitle: (<b>{data.project.title}</b>),
                     },
                 )
             }
-            actions={data?.status === 'pending' && (
+            actions={data.status === 'pending' && (
                 <>
                     <Button
                         name={undefined}
diff --git a/app/components/Notifications/NotificationItem/index.tsx b/app/components/Notifications/NotificationItem/index.tsx
index 2da65ce0f2..5944fb2d11 100644
--- a/app/components/Notifications/NotificationItem/index.tsx
+++ b/app/components/Notifications/NotificationItem/index.tsx
@@ -23,19 +23,19 @@ interface Props {
 }
 
 function getCommentTokenString(data: ReviewEntryCommentAdd['data']) {
-    if (data?.comment_type === EntryAction.COMMENT) {
+    if (data.comment_type === EntryAction.COMMENT) {
         return '{createdByName} assigned you to a comment in an {entryLink} in the project {projectTitle}.';
     }
-    if (data?.comment_type === EntryAction.VERIFY) {
+    if (data.comment_type === EntryAction.VERIFY) {
         return '{createdByName} verified an {entryLink} in the project {projectTitle}.';
     }
-    if (data?.comment_type === EntryAction.UNVERIFY) {
+    if (data.comment_type === EntryAction.UNVERIFY) {
         return '{createdByName} unverified an {entryLink} in the project {projectTitle}.';
     }
-    if (data?.comment_type === EntryAction.CONTROL) {
+    if (data.comment_type === EntryAction.CONTROL) {
         return '{createdByName} controlled an {entryLink} in the project {projectTitle}.';
     }
-    if (data?.comment_type === EntryAction.UNCONTROL) {
+    if (data.comment_type === EntryAction.UNCONTROL) {
         return '{createdByName} uncontrolled an {entryLink} in the project {projectTitle}.';
     }
     return '';
@@ -65,15 +65,15 @@ function NotificationItem(props: Props) {
             <NotificationContainer
                 className={_cs(className, styles.notificationItem)}
                 notification={notification}
-                userName={data?.requested_by?.display_name}
+                userName={data.requested_by.display_name}
                 descriptionLabel="Reason"
-                description={data?.reason}
+                description={data.reason}
                 content={
                     generateString(
                         '{requestorName} removed their join request to the project {projectTitle}.',
                         {
-                            requestorName: (<b>{data?.requested_by?.display_name}</b>),
-                            projectTitle: (<b>{data?.project?.title}</b>),
+                            requestorName: (<b>{data.requested_by.display_name}</b>),
+                            projectTitle: (<b>{data.project.title}</b>),
                         },
                     )
                 }
@@ -83,21 +83,21 @@ function NotificationItem(props: Props) {
     if (notification.notificationType === 'PROJECT_JOIN_RESPONSE') {
         const { data } = notification;
 
-        const content = data?.status === 'accepted'
+        const content = data.status === 'accepted'
             ? (generateString(
                 '{respondorName} accepted join request of {requestorName} in the project {projectTitle}.',
                 {
-                    requestorName: (<b>{data?.requested_by?.display_name}</b>),
-                    respondorName: (<b>{data?.responded_by?.display_name}</b>),
-                    projectTitle: (<b>{data?.project?.title}</b>),
+                    requestorName: (<b>{data.requested_by.display_name}</b>),
+                    respondorName: (<b>{data.responded_by.display_name}</b>),
+                    projectTitle: (<b>{data.project.title}</b>),
                 },
             )) : (
                 generateString(
                     '{respondorName} rejected join request of {requestorName} in the project {projectTitle}.',
                     {
-                        requestorName: (<b>{data?.requested_by?.display_name}</b>),
-                        respondorName: (<b>{data?.responded_by?.display_name}</b>),
-                        projectTitle: (<b>{data?.project?.title}</b>),
+                        requestorName: (<b>{data.requested_by.display_name}</b>),
+                        respondorName: (<b>{data.responded_by.display_name}</b>),
+                        projectTitle: (<b>{data.project.title}</b>),
                     },
                 )
             );
@@ -106,7 +106,7 @@ function NotificationItem(props: Props) {
             <NotificationContainer
                 className={_cs(className, styles.notificationItem)}
                 notification={notification}
-                userName={data?.requested_by?.display_name}
+                userName={data.requested_by.display_name}
                 content={content}
             />
         );
@@ -117,13 +117,13 @@ function NotificationItem(props: Props) {
             project,
         } = notification;
 
-        const editEntryLink = (project?.id && data?.lead) ? ({
+        const editEntryLink = (project?.id && data.lead) ? ({
             pathname: (generatePath(routes.entryEdit.path, {
-                projectId: project?.id,
-                leadId: data?.lead,
+                projectId: project.id,
+                leadId: data.lead,
             })),
             state: {
-                entryId: data?.entry,
+                entryId: data.entry,
             },
         }) : undefined;
 
@@ -131,14 +131,14 @@ function NotificationItem(props: Props) {
             <NotificationContainer
                 className={_cs(className, styles.notificationItem)}
                 notification={notification}
-                userName={data?.created_by_detail?.name}
+                userName={data.created_by_detail.name}
                 descriptionLabel="Comment"
-                description={data?.text}
+                description={data.text}
                 content={
                     generateString(
                         '{createdByName} assigned you to a comment in the {entryLink} in the project {projectTitle}.',
                         {
-                            createdByName: (<b>{data?.created_by_detail?.name}</b>),
+                            createdByName: (<b>{data.created_by_detail.name}</b>),
                             entryLink: editEntryLink ? (
                                 <Link
                                     className={styles.link}
@@ -163,13 +163,13 @@ function NotificationItem(props: Props) {
             project,
         } = notification;
 
-        const editEntryLink = (project?.id && data?.lead) ? ({
+        const editEntryLink = (project?.id && data.lead) ? ({
             pathname: (generatePath(routes.entryEdit.path, {
-                projectId: project?.id,
-                leadId: data?.lead,
+                projectId: project.id,
+                leadId: data.lead,
             })),
             state: {
-                entryId: data?.entry,
+                entryId: data.entry,
             },
         }) : undefined;
 
@@ -177,14 +177,14 @@ function NotificationItem(props: Props) {
             <NotificationContainer
                 className={_cs(className, styles.notificationItem)}
                 notification={notification}
-                userName={data?.created_by_detail?.name}
+                userName={data.created_by_detail.name}
                 descriptionLabel="Comment"
-                description={data?.text}
+                description={data.text}
                 content={
                     generateString(
                         '{createdByName} modified the comment you were assigned to in the {entryLink} in the project {projectTitle}.',
                         {
-                            createdByName: (<b>{data?.created_by_detail?.name}</b>),
+                            createdByName: (<b>{data.created_by_detail.name}</b>),
                             entryLink: editEntryLink ? (
                                 <Link
                                     className={styles.link}
@@ -212,10 +212,10 @@ function NotificationItem(props: Props) {
         const editEntryLink = {
             pathname: (generatePath(routes.entryEdit.path, {
                 projectId: project?.id,
-                leadId: data?.lead,
+                leadId: data.lead,
             })),
             state: {
-                entryId: data?.entry,
+                entryId: data.entry,
             },
         };
 
@@ -223,14 +223,14 @@ function NotificationItem(props: Props) {
             <NotificationContainer
                 className={_cs(className, styles.notificationItem)}
                 notification={notification}
-                userName={data?.created_by_detail?.name}
+                userName={data.created_by_detail.name}
                 descriptionLabel="Comment"
-                description={data?.text}
+                description={data.text}
                 content={
                     generateString(
                         '{createdByName} assigned you to a comment in the {entryLink} in the project {projectTitle}.',
                         {
-                            createdByName: (<b>{data?.created_by_detail?.name}</b>),
+                            createdByName: (<b>{data.created_by_detail.name}</b>),
                             entryLink: (
                                 <Link
                                     className={styles.link}
@@ -256,10 +256,10 @@ function NotificationItem(props: Props) {
         const editEntryLink = {
             pathname: (generatePath(routes.entryEdit.path, {
                 projectId: project?.id,
-                leadId: data?.lead,
+                leadId: data.lead,
             })),
             state: {
-                entryId: data?.entry,
+                entryId: data.entry,
             },
         };
 
@@ -267,14 +267,14 @@ function NotificationItem(props: Props) {
             <NotificationContainer
                 className={_cs(className, styles.notificationItem)}
                 notification={notification}
-                userName={data?.created_by_detail?.name}
+                userName={data.created_by_detail.name}
                 descriptionLabel="Comment"
-                description={data?.text}
+                description={data.text}
                 content={
                     generateString(
                         '{createdByName} replied to a comment in the {entryLink} you were following in the project {projectTitle}.',
                         {
-                            createdByName: (<b>{data?.created_by_detail?.name}</b>),
+                            createdByName: (<b>{data.created_by_detail.name}</b>),
                             entryLink: (
                                 <Link
                                     className={styles.link}
@@ -300,10 +300,10 @@ function NotificationItem(props: Props) {
         const editEntryLink = {
             pathname: (generatePath(routes.entryEdit.path, {
                 projectId: project?.id,
-                leadId: data?.lead,
+                leadId: data.lead,
             })),
             state: {
-                entryId: data?.entry,
+                entryId: data.entry,
             },
         };
 
@@ -311,14 +311,14 @@ function NotificationItem(props: Props) {
             <NotificationContainer
                 className={_cs(className, styles.notificationItem)}
                 notification={notification}
-                userName={data?.created_by_detail?.name}
+                userName={data.created_by_detail.name}
                 descriptionLabel="Comment"
-                description={data?.text}
+                description={data.text}
                 content={
                     generateString(
                         '{createdByName} modified the reply to a comment in the {entryLink} you were following in the project {projectTitle}.',
                         {
-                            createdByName: (<b>{data?.created_by_detail?.name}</b>),
+                            createdByName: (<b>{data.created_by_detail.name}</b>),
                             entryLink: (
                                 <Link
                                     className={styles.link}
@@ -344,10 +344,10 @@ function NotificationItem(props: Props) {
         const editEntryLink = {
             pathname: (generatePath(routes.entryEdit.path, {
                 projectId: project?.id,
-                leadId: data?.lead,
+                leadId: data.lead,
             })),
             state: {
-                entryId: data?.entry,
+                entryId: data.entry,
             },
         };
 
@@ -355,14 +355,14 @@ function NotificationItem(props: Props) {
             <NotificationContainer
                 className={_cs(className, styles.notificationItem)}
                 notification={notification}
-                userName={data?.created_by_detail?.name}
+                userName={data.created_by_detail.name}
                 descriptionLabel="Comment"
-                description={data?.text}
+                description={data.text}
                 content={
                     generateString(
                         '{createdByName} resolved the comment in the {entryLink} you were following in the project {projectTitle}.',
                         {
-                            createdByName: (<b>{data?.created_by_detail?.name}</b>),
+                            createdByName: (<b>{data.created_by_detail.name}</b>),
                             entryLink: (
                                 <Link
                                     className={styles.link}
@@ -384,17 +384,17 @@ function NotificationItem(props: Props) {
 
         const editEntryLink = {
             pathname: (generatePath(routes.entryEdit.path, {
-                projectId: data?.project_details?.id,
-                leadId: data?.lead,
+                projectId: data.project_details.id,
+                leadId: data.lead,
             })),
             state: {
-                entryId: data?.entry,
+                entryId: data.entry,
             },
         };
         const content = generateString(
             getCommentTokenString(data),
             {
-                createdByName: (<b>{data?.created_by_details?.name}</b>),
+                createdByName: (<b>{data.created_by_details.name}</b>),
                 entryLink: (
                     <Link
                         className={styles.link}
@@ -404,16 +404,16 @@ function NotificationItem(props: Props) {
                         entry
                     </Link>
                 ),
-                projectTitle: (<b>{data?.project_details?.title}</b>),
+                projectTitle: (<b>{data.project_details.title}</b>),
             },
         );
         return (
             <NotificationContainer
                 className={_cs(className, styles.notificationItem)}
                 notification={notification}
-                userName={data?.created_by_details?.name}
+                userName={data.created_by_details.name}
                 descriptionLabel="Comment"
-                description={data?.text}
+                description={data.text}
                 content={content}
             />
         );
@@ -424,11 +424,11 @@ function NotificationItem(props: Props) {
 
         const editEntryLink = {
             pathname: (generatePath(routes.entryEdit.path, {
-                projectId: data?.project_details?.id,
-                leadId: data?.lead,
+                projectId: data.project_details.id,
+                leadId: data.lead,
             })),
             state: {
-                entryId: data?.entry,
+                entryId: data.entry,
             },
         };
 
@@ -436,14 +436,14 @@ function NotificationItem(props: Props) {
             <NotificationContainer
                 className={_cs(className, styles.notificationItem)}
                 notification={notification}
-                userName={data?.created_by_details?.name}
+                userName={data.created_by_details.name}
                 descriptionLabel="Comment"
-                description={data?.text}
+                description={data.text}
                 content={
                     generateString(
                         '{createdByName} modified a comment you were following in the {entryLink} in the project {projectTitle}.',
                         {
-                            createdByName: (<b>{data?.created_by_details?.name}</b>),
+                            createdByName: (<b>{data.created_by_details.name}</b>),
                             entryLink: (
                                 <Link
                                     className={styles.link}
@@ -453,7 +453,7 @@ function NotificationItem(props: Props) {
                                     entry
                                 </Link>
                             ),
-                            projectTitle: (<b>{data?.project_details?.title}</b>),
+                            projectTitle: (<b>{data.project_details.title}</b>),
                         },
                     )
                 }
diff --git a/app/components/OrganigramInput/index.tsx b/app/components/OrganigramInput/index.tsx
index 8855dc6439..7c41851ae5 100644
--- a/app/components/OrganigramInput/index.tsx
+++ b/app/components/OrganigramInput/index.tsx
@@ -26,7 +26,7 @@ function transformData(data: PartialForm<OrganigramDatum, 'key'>): OrganigramDat
         return {
             ...data,
             id: data.key,
-            children: data.children.map(transformData) ?? [],
+            children: data.children.map(transformData),
             label: data.label ?? 'Unnamed',
             order: data.order ?? 1,
         };
@@ -59,7 +59,7 @@ function OrganigramInput<N extends string>(props: Props<N>) {
                 return;
             }
             if (value?.some((v) => v === data.key)) {
-                onChange(value?.filter((v) => v !== data.key), name);
+                onChange(value.filter((v) => v !== data.key), name);
             } else {
                 onChange([...(value ?? []), data.key], name);
             }
diff --git a/app/components/RechartsLegend/index.tsx b/app/components/RechartsLegend/index.tsx
index feeeaacf4c..6a08e6df47 100644
--- a/app/components/RechartsLegend/index.tsx
+++ b/app/components/RechartsLegend/index.tsx
@@ -34,7 +34,7 @@ function RechartsLegend(props: Props) {
                     percent?: number;
                 }
 
-                const percent = (localPayload as unknown as LocalPayload)?.percent;
+                const { percent } = localPayload as unknown as LocalPayload;
 
                 const key = `legend-item-${index}`;
 
diff --git a/app/components/Screenshot/index.tsx b/app/components/Screenshot/index.tsx
index 2a1dcb645b..3973f3cedf 100644
--- a/app/components/Screenshot/index.tsx
+++ b/app/components/Screenshot/index.tsx
@@ -18,10 +18,6 @@ function getCroppedImage(
     endX: number,
     endY: number,
 ) {
-    if (!canvas || !image) {
-        return undefined;
-    }
-
     /* eslint-disable no-param-reassign */
     canvas.width = endX - startX;
     canvas.height = endY - startY;
@@ -85,7 +81,7 @@ function Screenshot(props: Props) {
     });
 
     const handleResize = React.useCallback((width = 0, height = 0) => {
-        if (!firstResizeRef.current && width > 0 && height > 0 && onCancel) {
+        if (!firstResizeRef.current && width > 0 && height > 0) {
             onCancel();
         }
 
@@ -96,10 +92,6 @@ function Screenshot(props: Props) {
     const svgRef = React.useRef<SVGSVGElement>(null);
     const canvasRef = React.useRef<HTMLCanvasElement>(null);
     const handleBrush = React.useCallback((event) => {
-        if (!onCapture) {
-            return;
-        }
-
         const r = event.selection;
         if (!canvasRef.current || !imageProps.image || !r) {
             onCapture(undefined);
@@ -159,9 +151,7 @@ function Screenshot(props: Props) {
                     </a>
                 </div>
             );
-            if (onCaptureError) {
-                onCaptureError(captureError);
-            }
+            onCaptureError(captureError);
         });
 
         if (!svgRef.current || !brushContainerRef.current) {
@@ -182,9 +172,7 @@ function Screenshot(props: Props) {
         brushGroup.call(brush);
 
         return () => {
-            if (brushGroup) {
-                brushGroup.remove();
-            }
+            brushGroup.remove();
         };
     }, [handleBrush, onCaptureError]);
 
diff --git a/app/components/SortableList/index.tsx b/app/components/SortableList/index.tsx
index f227f6f331..007976e0b2 100644
--- a/app/components/SortableList/index.tsx
+++ b/app/components/SortableList/index.tsx
@@ -32,6 +32,7 @@ import {
 } from '@dnd-kit/sortable';
 import { listToMap, isDefined } from '@togglecorp/fujs';
 
+import { find } from '#base/utils/common';
 import { genericMemo } from '#utils/common';
 
 type OptionKey = string | number;
@@ -190,7 +191,7 @@ function SortableList<
         const { active, over } = event;
         setActiveId(undefined);
 
-        if (active.id && over?.id && active.id !== over?.id && items && onChange) {
+        if (active.id && over?.id && active.id !== over.id && onChange) {
             const oldIndex = items.indexOf(active.id);
             const newIndex = items.indexOf(over.id);
 
@@ -209,16 +210,17 @@ function SortableList<
         if (!activeId || !data || !showDragOverlay) {
             return null;
         }
-        const activeIndex = data.findIndex(
+        const activeDatum = find(
+            data,
             (d) => String(keySelector(d)) === activeId,
         );
-        if (!activeIndex) {
+        if (!activeDatum.index) {
             return null;
         }
         const params = rendererParams(
-            keySelector(data[activeIndex]),
-            data[activeIndex],
-            activeIndex,
+            keySelector(activeDatum.value),
+            activeDatum.value,
+            activeDatum.index,
             data,
         );
         if (!params) {
diff --git a/app/components/TreeSelection/index.tsx b/app/components/TreeSelection/index.tsx
index 5d3c9e5915..bc80b6f74d 100644
--- a/app/components/TreeSelection/index.tsx
+++ b/app/components/TreeSelection/index.tsx
@@ -128,9 +128,6 @@ function TreeSelection<N extends string, T extends Node>(props: Props<N, T>) {
 
     // Handle toggling the state of checkbox including its children
     const handleCheckboxChange = useCallback((newValue: boolean, key: string) => {
-        if (!onChange) {
-            return;
-        }
         const tempValue = [...value];
 
         const index = tempValue.findIndex((v) => v.key === key);
@@ -140,10 +137,6 @@ function TreeSelection<N extends string, T extends Node>(props: Props<N, T>) {
     }, [onChange, value, name]);
 
     const handleChildrenChange = useCallback((nodes: T[], key: string) => {
-        if (!onChange) {
-            return;
-        }
-
         const tempValue = [...value];
         const index = tempValue.findIndex((v) => v.key === key);
         const selected = nodes.some((n) => n.selected);
diff --git a/app/components/entry/CompactSection/index.tsx b/app/components/entry/CompactSection/index.tsx
index b115a99b77..3f9d1d1088 100644
--- a/app/components/entry/CompactSection/index.tsx
+++ b/app/components/entry/CompactSection/index.tsx
@@ -87,17 +87,17 @@ function CompactSection(props: Props) {
             (widget) => {
                 if (widget.widgetId === 'MATRIX1D') {
                     return !doesObjectHaveNoData(
-                        attributesMap?.[widget.clientId]?.value?.data?.value,
+                        attributesMap[widget.clientId]?.value.data?.value,
                         [''],
                     );
                 }
 
                 if (widget.widgetId === 'MATRIX2D') {
-                    const val = attributesMap?.[widget.clientId]?.value?.data?.value;
+                    const val = attributesMap[widget.clientId]?.value.data?.value;
                     return Object.keys(val ?? {}).length > 0;
                 }
 
-                return isDefined(attributesMap?.[widget.clientId]?.value?.data?.value);
+                return isDefined(attributesMap[widget.clientId]?.value.data?.value);
             },
         );
     }, [emptyValueHidden, attributesMap, filteredWidgets]);
diff --git a/app/components/entryReview/EntryCommentWrapper/index.tsx b/app/components/entryReview/EntryCommentWrapper/index.tsx
index 70a2b3ed50..1d60096546 100644
--- a/app/components/entryReview/EntryCommentWrapper/index.tsx
+++ b/app/components/entryReview/EntryCommentWrapper/index.tsx
@@ -16,7 +16,7 @@ function EntryCommentWrapper(props: EntryCommentsProps) {
     const handleEntryCommentAdd = useCallback(() => {
         setCommentsCountMap((oldCounts) => ({
             ...oldCounts,
-            [String(entryId)]: (oldCounts?.[String(entryId)] ?? 0) + 1,
+            [String(entryId)]: (oldCounts[String(entryId)] ?? 0) + 1,
         }));
     }, [entryId, setCommentsCountMap]);
 
@@ -24,7 +24,7 @@ function EntryCommentWrapper(props: EntryCommentsProps) {
         <EntryComments
             {...props}
             entryId={entryId}
-            activityCount={commentsCountMap?.[String(entryId)]}
+            activityCount={commentsCountMap[String(entryId)]}
             onEntryCommentAdd={handleEntryCommentAdd}
         />
     );
diff --git a/app/components/entryReview/EntryComments/Comment/index.tsx b/app/components/entryReview/EntryComments/Comment/index.tsx
index 5684c89dd4..98c09802ca 100644
--- a/app/components/entryReview/EntryComments/Comment/index.tsx
+++ b/app/components/entryReview/EntryComments/Comment/index.tsx
@@ -46,7 +46,7 @@ function Comment(props: Props) {
     const [latest] = textHistory;
 
     const isEditable = useMemo(() => (
-        user?.id === createdByDetails?.id.toString() && latest
+        user?.id === createdByDetails.id.toString() && latest
     ), [user, createdByDetails, latest]);
 
     const handleSuccess = useCallback((value: EntryComment) => {
@@ -78,7 +78,7 @@ function Comment(props: Props) {
                 >
                     <div className={styles.userAction}>
                         <span className={styles.userName}>
-                            {createdByDetails?.name}
+                            {createdByDetails.name}
                         </span>
                         &nbsp;
                         {commentType !== 0 && (
@@ -94,7 +94,7 @@ function Comment(props: Props) {
                             onEditSuccess={handleSuccess}
                             onEditCancel={hideEditModal}
                         />
-                    ) : (latest?.text && (
+                    ) : (latest.text && (
                         <Card
                             className={styles.comment}
                         >
diff --git a/app/components/framework/AttributeInput/Matrix1dWidgetInput/index.tsx b/app/components/framework/AttributeInput/Matrix1dWidgetInput/index.tsx
index 0680d8bdb5..1291a58ede 100644
--- a/app/components/framework/AttributeInput/Matrix1dWidgetInput/index.tsx
+++ b/app/components/framework/AttributeInput/Matrix1dWidgetInput/index.tsx
@@ -180,15 +180,15 @@ function Matrix1dWidgetInput<N extends string>(props: Props<N>) {
     );
 
     const sortedRows = useMemo(() => (
-        sortByOrder(widget?.properties?.rows)
-    ), [widget?.properties?.rows]);
+        sortByOrder(widget.properties?.rows)
+    ), [widget.properties?.rows]);
 
     const handleCellChange = useCallback(
         (rowId: string, cellId: string, state: boolean | undefined) => {
             const newValue = removeEmptyObject(removeUndefinedKeys({
                 ...value?.value,
                 [rowId]: {
-                    ...value?.value?.[rowId],
+                    ...value?.value[rowId],
                     [cellId]: state,
                 },
             }));
@@ -205,7 +205,7 @@ function Matrix1dWidgetInput<N extends string>(props: Props<N>) {
         (key: string, row: RowType) => ({
             disabled,
             readOnly,
-            value: value?.value?.[key],
+            value: value?.value[key],
             row,
             onCellChange: handleCellChange,
         }),
diff --git a/app/components/framework/AttributeInput/Matrix2dWidgetInput/index.tsx b/app/components/framework/AttributeInput/Matrix2dWidgetInput/index.tsx
index 6e5e76e948..1c88b47d93 100644
--- a/app/components/framework/AttributeInput/Matrix2dWidgetInput/index.tsx
+++ b/app/components/framework/AttributeInput/Matrix2dWidgetInput/index.tsx
@@ -374,10 +374,10 @@ function Matrix2dWidgetInput<N extends string>(props: Props<N>) {
             const newValue = removeEmptyObject(removeUndefinedKeys({
                 ...value?.value,
                 [rowId]: {
-                    ...value?.value?.[rowId],
+                    ...value?.value[rowId],
                     [subRowId]: {
-                        ...value?.value?.[rowId]?.[subRowId],
-                        [columnId]: state(value?.value?.[rowId]?.[subRowId]?.[columnId]),
+                        ...value?.value[rowId]?.[subRowId],
+                        [columnId]: state(value?.value[rowId]?.[subRowId]?.[columnId]),
                     },
                 },
             }));
@@ -392,14 +392,14 @@ function Matrix2dWidgetInput<N extends string>(props: Props<N>) {
     );
 
     const columns = useMemo(() => (
-        sortByOrder(widget?.properties?.columns)
-    ), [widget?.properties?.columns]);
+        sortByOrder(widget.properties?.columns)
+    ), [widget.properties?.columns]);
 
     const rowRendererParams = useCallback(
         (key: string, row: RowType) => ({
             disabled,
             readOnly,
-            value: value?.value?.[key],
+            value: value?.value[key],
             row,
             columns,
             onSubRowChange: handleSubRowChange,
@@ -408,8 +408,8 @@ function Matrix2dWidgetInput<N extends string>(props: Props<N>) {
     );
 
     const orderedRows = useMemo(() => (
-        sortByOrder(widget?.properties?.rows)
-    ), [widget?.properties?.rows]);
+        sortByOrder(widget.properties?.rows)
+    ), [widget.properties?.rows]);
 
     return (
         <WidgetWrapper
diff --git a/app/components/framework/AttributeInput/MultiSelectWidgetInput/index.tsx b/app/components/framework/AttributeInput/MultiSelectWidgetInput/index.tsx
index 71cdfdb379..978bf0a7bb 100644
--- a/app/components/framework/AttributeInput/MultiSelectWidgetInput/index.tsx
+++ b/app/components/framework/AttributeInput/MultiSelectWidgetInput/index.tsx
@@ -71,7 +71,7 @@ function MultiSelectWidgetInput<N extends string>(props: Props<N>) {
         [onChangeFromProps],
     );
 
-    const widgetOptions = widget?.properties?.options;
+    const widgetOptions = widget.properties?.options;
     const sortedOptions = useMemo(() => (
         sortByOrder(widgetOptions)
     ), [widgetOptions]);
diff --git a/app/components/framework/AttributeInput/ScaleWidgetInput/index.tsx b/app/components/framework/AttributeInput/ScaleWidgetInput/index.tsx
index e1a1055a3f..2fa9dcface 100644
--- a/app/components/framework/AttributeInput/ScaleWidgetInput/index.tsx
+++ b/app/components/framework/AttributeInput/ScaleWidgetInput/index.tsx
@@ -62,8 +62,8 @@ function ScaleWidgetInput<N extends string>(props: Props<N>) {
     const error = getErrorObject(riskyError);
 
     const sortedOptions = useMemo(() => (
-        sortByOrder(widget?.properties?.options)
-    ), [widget?.properties?.options]);
+        sortByOrder(widget.properties?.options)
+    ), [widget.properties?.options]);
 
     const onChange = useCallback(
         (val: ScaleValue['value'] | undefined, inputName: N) => {
@@ -94,7 +94,7 @@ function ScaleWidgetInput<N extends string>(props: Props<N>) {
                 labelSelector={optionLabelSelector}
                 colorSelector={optionColorSelector}
                 onChange={onChange}
-                value={value?.value ?? widget?.properties?.defaultValue}
+                value={value?.value ?? widget.properties?.defaultValue}
                 readOnly={readOnly}
                 disabled={disabled}
                 error={error?.value}
diff --git a/app/components/framework/AttributeInput/SingleSelectWidgetInput/index.tsx b/app/components/framework/AttributeInput/SingleSelectWidgetInput/index.tsx
index 8920436908..4a9589482c 100644
--- a/app/components/framework/AttributeInput/SingleSelectWidgetInput/index.tsx
+++ b/app/components/framework/AttributeInput/SingleSelectWidgetInput/index.tsx
@@ -71,7 +71,7 @@ function SingleSelectWidgetInput<N extends string>(props: Props<N>) {
         [onChangeFromProps],
     );
 
-    const widgetOptions = widget?.properties?.options;
+    const widgetOptions = widget.properties?.options;
     const sortedOptions = useMemo(() => (
         sortByOrder(widgetOptions)
     ), [widgetOptions]);
diff --git a/app/components/framework/CompactAttributeInput/DateRangeWidgetInput/index.tsx b/app/components/framework/CompactAttributeInput/DateRangeWidgetInput/index.tsx
index bf624ae071..9cf93971ec 100644
--- a/app/components/framework/CompactAttributeInput/DateRangeWidgetInput/index.tsx
+++ b/app/components/framework/CompactAttributeInput/DateRangeWidgetInput/index.tsx
@@ -91,8 +91,8 @@ function DateRangeWidgetInput<N extends string>(props: Props<N>) {
             ) : (
                 <DateRangeOutput
                     className={styles.input}
-                    startDate={value?.value?.startDate}
-                    endDate={value?.value?.endDate}
+                    startDate={value?.value.startDate}
+                    endDate={value?.value.endDate}
                 />
             )}
         </WidgetWrapper>
diff --git a/app/components/framework/CompactAttributeInput/GeoLocationWidgetInput/index.tsx b/app/components/framework/CompactAttributeInput/GeoLocationWidgetInput/index.tsx
index 684e38c9e0..6200f7d54e 100644
--- a/app/components/framework/CompactAttributeInput/GeoLocationWidgetInput/index.tsx
+++ b/app/components/framework/CompactAttributeInput/GeoLocationWidgetInput/index.tsx
@@ -70,7 +70,7 @@ function GeoLocationWidgetInput<N extends string>(props: Props<N>) {
             (d) => d.id,
             (d) => breadcrumb([d.regionTitle, d.adminLevelTitle, d.title]),
         );
-        return value?.value?.map((v) => optionsMap?.[v]);
+        return value?.value.map((v) => optionsMap?.[v]);
     }, [geoAreaOptions, value]);
 
     return (
diff --git a/app/components/framework/CompactAttributeInput/Matrix1dWidgetInput/index.tsx b/app/components/framework/CompactAttributeInput/Matrix1dWidgetInput/index.tsx
index db1c10a92c..8fbdf1c7ea 100644
--- a/app/components/framework/CompactAttributeInput/Matrix1dWidgetInput/index.tsx
+++ b/app/components/framework/CompactAttributeInput/Matrix1dWidgetInput/index.tsx
@@ -87,7 +87,7 @@ function Row(props: RowProps) {
             </div>
             {!readOnly ? (
                 <MultiSelectInput
-                    name={row?.key}
+                    name={row.key}
                     onChange={handleCellsChange}
                     options={sortedCells}
                     labelSelector={cellLabelSelector}
@@ -150,12 +150,12 @@ function Matrix1dWidgetInput<N extends string>(props: Props<N>) {
         [onChangeFromProps],
     );
 
-    const widgetRows = widget?.properties?.rows;
+    const widgetRows = widget.properties?.rows;
 
     const filteredRows = useMemo(() => {
         const rows = widgetRows?.filter(
             (row) => {
-                const rowValue = value?.value?.[row.key];
+                const rowValue = value?.value[row.key];
                 return !!rowValue && Object.values(rowValue).some((d) => d);
             },
         );
@@ -181,7 +181,7 @@ function Matrix1dWidgetInput<N extends string>(props: Props<N>) {
         (key: string, row: RowType) => ({
             disabled,
             readOnly,
-            value: value?.value?.[key],
+            value: value?.value[key],
             row,
             onCellsChange: handleCellsChange,
         }),
diff --git a/app/components/framework/CompactAttributeInput/Matrix2dWidgetInput/index.tsx b/app/components/framework/CompactAttributeInput/Matrix2dWidgetInput/index.tsx
index 4ba5d7f355..580c6510db 100644
--- a/app/components/framework/CompactAttributeInput/Matrix2dWidgetInput/index.tsx
+++ b/app/components/framework/CompactAttributeInput/Matrix2dWidgetInput/index.tsx
@@ -305,9 +305,9 @@ function Matrix2dWidgetInput<N extends string>(props: Props<N>) {
             const newValue = {
                 ...value?.value,
                 [rowId]: {
-                    ...value?.value?.[rowId],
+                    ...value?.value[rowId],
                     [subRowId]: {
-                        ...value?.value?.[rowId]?.[subRowId],
+                        ...value?.value[rowId]?.[subRowId],
                         [columnId]: newSubColValue,
                     },
                 },
@@ -323,14 +323,14 @@ function Matrix2dWidgetInput<N extends string>(props: Props<N>) {
     );
 
     const columns = useMemo(() => (
-        sortByOrder(widget?.properties?.columns)
-    ), [widget?.properties?.columns]);
+        sortByOrder(widget.properties?.columns)
+    ), [widget.properties?.columns]);
 
     const rowRendererParams = useCallback(
         (key: string, row: RowType) => ({
             disabled,
             readOnly,
-            value: value?.value?.[key],
+            value: value?.value[key],
             row,
             columns,
             onSubColumnsChange: handleSubColumnsChange,
@@ -338,10 +338,10 @@ function Matrix2dWidgetInput<N extends string>(props: Props<N>) {
         [disabled, readOnly, handleSubColumnsChange, value, columns],
     );
 
-    const widgetRows = widget?.properties?.rows;
+    const widgetRows = widget.properties?.rows;
 
     const orderedRows = useMemo(() => {
-        const filteredRows = widgetRows?.filter((wr) => value?.value?.[wr.key]);
+        const filteredRows = widgetRows?.filter((wr) => value?.value[wr.key]);
         return sortByOrder(filteredRows);
     }, [widgetRows, value]);
 
diff --git a/app/components/framework/CompactAttributeInput/MultiSelectWidgetInput/index.tsx b/app/components/framework/CompactAttributeInput/MultiSelectWidgetInput/index.tsx
index ed2889c02c..6c9317e4b5 100644
--- a/app/components/framework/CompactAttributeInput/MultiSelectWidgetInput/index.tsx
+++ b/app/components/framework/CompactAttributeInput/MultiSelectWidgetInput/index.tsx
@@ -71,14 +71,14 @@ function MultiSelectWidgetInput<N extends string>(props: Props<N>) {
         [onChangeFromProps],
     );
 
-    const widgetOptions = widget?.properties?.options;
+    const widgetOptions = widget.properties?.options;
     const sortedOptions = useMemo(() => (
         sortByOrder(widgetOptions)
     ), [widgetOptions]);
 
     const selectedValues = useMemo(() => {
         const optionsMap = listToMap(widgetOptions, (d) => d.key, (d) => d.label);
-        return value?.value?.map((v) => optionsMap?.[v]);
+        return value?.value.map((v) => optionsMap?.[v]);
     }, [widgetOptions, value]);
 
     return (
diff --git a/app/components/framework/CompactAttributeInput/OrganigramWidgetInput/index.tsx b/app/components/framework/CompactAttributeInput/OrganigramWidgetInput/index.tsx
index 9e3f2c0a93..e9e34f6e01 100644
--- a/app/components/framework/CompactAttributeInput/OrganigramWidgetInput/index.tsx
+++ b/app/components/framework/CompactAttributeInput/OrganigramWidgetInput/index.tsx
@@ -92,7 +92,7 @@ function OrganigramWidgetInput<N extends string>(props: Props<N>) {
 
     const selectedValues = useMemo(() => {
         const optionsMap = listToMap(options, (d) => d.key, (d) => d.label);
-        return value?.value?.map((v) => optionsMap?.[v]);
+        return value?.value.map((v) => optionsMap[v]);
     }, [options, value]);
 
     return (
diff --git a/app/components/framework/CompactAttributeInput/ScaleWidgetInput/index.tsx b/app/components/framework/CompactAttributeInput/ScaleWidgetInput/index.tsx
index 26c7c8a318..ac77df325b 100644
--- a/app/components/framework/CompactAttributeInput/ScaleWidgetInput/index.tsx
+++ b/app/components/framework/CompactAttributeInput/ScaleWidgetInput/index.tsx
@@ -62,8 +62,8 @@ function ScaleWidgetInput<N extends string>(props: Props<N>) {
     const error = getErrorObject(riskyError);
 
     const sortedOptions = useMemo(() => (
-        sortByOrder(widget?.properties?.options)
-    ), [widget?.properties?.options]);
+        sortByOrder(widget.properties?.options)
+    ), [widget.properties?.options]);
 
     const onChange = useCallback(
         (val: ScaleValue['value'] | undefined, inputName: N) => {
@@ -96,7 +96,7 @@ function ScaleWidgetInput<N extends string>(props: Props<N>) {
                 labelSelector={optionLabelSelector}
                 colorSelector={optionColorSelector}
                 onChange={onChange}
-                value={value?.value ?? widget?.properties?.defaultValue}
+                value={value?.value ?? widget.properties?.defaultValue}
                 readOnly={readOnly}
                 disabled={disabled}
                 error={error?.value}
diff --git a/app/components/framework/CompactAttributeInput/SingleSelectWidgetInput/index.tsx b/app/components/framework/CompactAttributeInput/SingleSelectWidgetInput/index.tsx
index cf9e86900d..beeb5e314c 100644
--- a/app/components/framework/CompactAttributeInput/SingleSelectWidgetInput/index.tsx
+++ b/app/components/framework/CompactAttributeInput/SingleSelectWidgetInput/index.tsx
@@ -71,7 +71,7 @@ function SingleSelectWidgetInput<N extends string>(props: Props<N>) {
         [onChangeFromProps],
     );
 
-    const widgetOptions = widget?.properties?.options;
+    const widgetOptions = widget.properties?.options;
     const sortedOptions = useMemo(() => (
         sortByOrder(widgetOptions)
     ), [widgetOptions]);
diff --git a/app/components/framework/CompactAttributeInput/TimeRangeWidgetInput/index.tsx b/app/components/framework/CompactAttributeInput/TimeRangeWidgetInput/index.tsx
index 05d09b1c41..89af5a664c 100644
--- a/app/components/framework/CompactAttributeInput/TimeRangeWidgetInput/index.tsx
+++ b/app/components/framework/CompactAttributeInput/TimeRangeWidgetInput/index.tsx
@@ -75,8 +75,8 @@ function TimeRangeWidgetInput<N extends string>(props: Props<N>) {
         >
             {readOnly ? (
                 <TimeRangeOutput
-                    startTime={value?.value?.startTime}
-                    endTime={value?.value?.startTime}
+                    startTime={value?.value.startTime}
+                    endTime={value?.value.startTime}
                 />
             ) : (
                 <>
diff --git a/app/components/general/AddLeadGroupModal/index.tsx b/app/components/general/AddLeadGroupModal/index.tsx
index 816a14be67..f83aacb0cb 100644
--- a/app/components/general/AddLeadGroupModal/index.tsx
+++ b/app/components/general/AddLeadGroupModal/index.tsx
@@ -74,7 +74,7 @@ function AddLeadGroupModal(props: Props) {
         onSuccess: (response) => {
             setValue({
                 ...value,
-                title: response?.title,
+                title: response.title,
             });
         },
     });
@@ -143,7 +143,7 @@ function AddLeadGroupModal(props: Props) {
             {(leadGroupFetchPending || leadGroupAddPending) && <PendingMessage />}
             <TextInput
                 name="title"
-                value={value?.title}
+                value={value.title}
                 error={error?.title}
                 onChange={setFieldValue}
                 label={_ts('addLeadGroup', 'titleLabel')}
diff --git a/app/components/general/AddOrganizationModal/index.tsx b/app/components/general/AddOrganizationModal/index.tsx
index 17e8447f2d..c2c41371b5 100644
--- a/app/components/general/AddOrganizationModal/index.tsx
+++ b/app/components/general/AddOrganizationModal/index.tsx
@@ -138,7 +138,7 @@ function AddOrganizationModal(props: Props) {
                 name="title"
                 disabled={pending}
                 onChange={setFieldValue}
-                value={value?.title}
+                value={value.title}
                 error={error?.title}
                 label={_ts('addOrganizationModal', 'titleLabel')}
                 placeholder={_ts('addOrganizationModal', 'titleLabel')}
@@ -148,7 +148,7 @@ function AddOrganizationModal(props: Props) {
                 name="shortName"
                 disabled={pending}
                 onChange={setFieldValue}
-                value={value?.shortName}
+                value={value.shortName}
                 error={error?.shortName}
                 label={_ts('addOrganizationModal', 'shortName')}
                 placeholder={_ts('addOrganizationModal', 'shortName')}
@@ -157,7 +157,7 @@ function AddOrganizationModal(props: Props) {
                 name="url"
                 disabled={pending}
                 onChange={setFieldValue}
-                value={value?.url}
+                value={value.url}
                 error={error?.url}
                 label={_ts('addOrganizationModal', 'url')}
                 placeholder={_ts('addOrganizationModal', 'url')}
@@ -166,7 +166,7 @@ function AddOrganizationModal(props: Props) {
                 name="organizationType"
                 onChange={setFieldValue}
                 options={organizatonTypesResponse?.results}
-                value={value?.organizationType}
+                value={value.organizationType}
                 error={error?.organizationType}
                 keySelector={organizationTypeKeySelector}
                 labelSelector={organizationTypeLabelSelector}
diff --git a/app/components/general/AddStakeholderModal/index.tsx b/app/components/general/AddStakeholderModal/index.tsx
index b13426d736..e771a18044 100644
--- a/app/components/general/AddStakeholderModal/index.tsx
+++ b/app/components/general/AddStakeholderModal/index.tsx
@@ -91,7 +91,7 @@ function AddStakeholderModal<T extends string>(props: Props<T>) {
     );
     const handleSubmitButtonClick = () => {
         const organizations = mapToList(value, (v, key) => {
-            const out = v?.map((o) => ({
+            const out = v.map((o) => ({
                 organization: o,
                 organizationType: key as OrganizationTypes,
             }));
diff --git a/app/components/lead/LeadInput/EmmStats/index.tsx b/app/components/lead/LeadInput/EmmStats/index.tsx
index de845494dd..9ed83da552 100644
--- a/app/components/lead/LeadInput/EmmStats/index.tsx
+++ b/app/components/lead/LeadInput/EmmStats/index.tsx
@@ -42,8 +42,8 @@ function EmmStatsModal(props: Props) {
         emmTriggers,
     } = props;
 
-    const showEntities = emmEntities && emmEntities?.length > 0;
-    const showTriggers = emmTriggers && emmTriggers?.length > 0;
+    const showEntities = emmEntities && emmEntities.length > 0;
+    const showTriggers = emmTriggers && emmTriggers.length > 0;
 
     return (
         <div className={_cs(className, styles.body)}>
@@ -56,7 +56,7 @@ function EmmStatsModal(props: Props) {
                     <ListView
                         className={styles.list}
                         renderer={Tag}
-                        data={emmTriggers ?? undefined}
+                        data={emmTriggers}
                         keySelector={emmTriggerKeySelector}
                         rendererParams={emmTriggerRendererParams}
                         pending={false}
@@ -74,7 +74,7 @@ function EmmStatsModal(props: Props) {
                     <ListView
                         className={styles.list}
                         renderer={Tag}
-                        data={emmEntities ?? undefined}
+                        data={emmEntities}
                         keySelector={emmEntitiesKeySelector}
                         rendererParams={emmEntitiesRendererParams}
                         pending={false}
diff --git a/app/components/lead/LeadPreview/index.tsx b/app/components/lead/LeadPreview/index.tsx
index 0be000b415..9872d2f707 100644
--- a/app/components/lead/LeadPreview/index.tsx
+++ b/app/components/lead/LeadPreview/index.tsx
@@ -69,8 +69,8 @@ function LeadPreview(props: Props) {
             return;
         }
         const { current: viewerContainer } = containerRef;
-        if (!fullScreenMode && isDefined(viewerContainer?.requestFullscreen)) {
-            viewerContainer?.requestFullscreen();
+        if (!fullScreenMode && isDefined(viewerContainer.requestFullscreen)) {
+            viewerContainer.requestFullscreen();
         } else if (fullScreenMode && isDefined(document.exitFullscreen)) {
             document.exitFullscreen();
         }
diff --git a/app/components/region/RegionMap/index.tsx b/app/components/region/RegionMap/index.tsx
index 563f18c4e0..4304ead30d 100644
--- a/app/components/region/RegionMap/index.tsx
+++ b/app/components/region/RegionMap/index.tsx
@@ -225,10 +225,10 @@ function RegionMap(props: Props) {
         );
         const thickness = (
             isDefined(noOfAdminLevels) && isDefined(selectedAdminLevel)
-            && noOfAdminLevels > (selectedAdminLevel?.level ?? 0)
+            && noOfAdminLevels > (selectedAdminLevel.level ?? 0)
         )
             // eslint-disable-next-line max-len
-            ? (1 + (scaleFactor * ((noOfAdminLevels - (selectedAdminLevel?.level ?? 0)) / noOfAdminLevels)))
+            ? (1 + (scaleFactor * ((noOfAdminLevels - (selectedAdminLevel.level ?? 0)) / noOfAdminLevels)))
             : 1;
 
         return {
@@ -257,7 +257,7 @@ function RegionMap(props: Props) {
             selections.push(selection);
             const selectedGeoArea = {
                 id: selection,
-                title: properties?.title as string ?? '',
+                title: properties?.title as (string | undefined) ?? '',
                 regionTitle: selectedRegion?.region?.title ?? '',
                 adminLevelTitle: selectedAdminLevelTitle ?? '',
             };
diff --git a/app/translate/index.tsx b/app/translate/index.tsx
index bf9b986623..2842d881cc 100644
--- a/app/translate/index.tsx
+++ b/app/translate/index.tsx
@@ -46,7 +46,7 @@ function renderElement<T>(r: KeyValue<T>) {
 
 function format(
     str: string,
-    params: Record<string, string | string[] | number | React.ReactNode>,
+    params: Record<string, string | string[] | number | React.ReactNode | undefined>,
 ) {
     // TODO: Support escaping { and }
 
@@ -99,8 +99,8 @@ function format(
 }
 
 const getString = (
-    strings: Record<string, string>,
-    links: Record<string, Record<string, number>>,
+    strings: Record<string, string | undefined>,
+    links: Record<string, Record<string, number | undefined> | undefined>,
     namespace: keyof DevLang['links'],
     identifier: string,
 ) => {
@@ -118,13 +118,13 @@ function _ts(
 function _ts(
     namespace: keyof DevLang['links'],
     identifier: string,
-    params: Record<string, React.ReactNode>,
+    params: Record<string, React.ReactNode | undefined>,
 ): React.ReactNode;
 // eslint-disable-next-line no-underscore-dangle
 function _ts(
     namespace: keyof DevLang['links'],
     identifier: string,
-    params?: Record<string, React.ReactNode>,
+    params?: Record<string, React.ReactNode | undefined>,
 ) {
     const str = getString(
         devLang.strings,
diff --git a/app/types/newAnalyticalFramework.ts b/app/types/newAnalyticalFramework.ts
index 041d6eee0a..729cbf80e2 100644
--- a/app/types/newAnalyticalFramework.ts
+++ b/app/types/newAnalyticalFramework.ts
@@ -869,8 +869,8 @@ function validateDateRangeCondition(
     condition: DateRangeCondition,
     attribute: PartializeAttribute<DateRangeWidgetAttribute> | undefined,
 ) {
-    const startValue = convertDateStringToTimestamp(attribute?.data?.value?.startDate);
-    const endValue = convertDateStringToTimestamp(attribute?.data?.value?.endDate);
+    const startValue = convertDateStringToTimestamp(attribute?.data?.value.startDate);
+    const endValue = convertDateStringToTimestamp(attribute?.data?.value.endDate);
     switch (condition.operator) {
         case 'empty':
             return isNotDefined(startValue) && isNotDefined(endValue);
@@ -893,8 +893,8 @@ function validateTimeRangeCondition(
     condition: TimeRangeCondition,
     attribute: PartializeAttribute<TimeRangeWidgetAttribute> | undefined,
 ) {
-    const startValue = convertTimeStringToSeconds(attribute?.data?.value?.startTime);
-    const endValue = convertTimeStringToSeconds(attribute?.data?.value?.endTime);
+    const startValue = convertTimeStringToSeconds(attribute?.data?.value.startTime);
+    const endValue = convertTimeStringToSeconds(attribute?.data?.value.endTime);
     switch (condition.operator) {
         case 'empty':
             return isNotDefined(startValue) && isNotDefined(endValue);
diff --git a/app/utils/browserExtension.tsx b/app/utils/browserExtension.tsx
index a40c790816..7ccab9a557 100644
--- a/app/utils/browserExtension.tsx
+++ b/app/utils/browserExtension.tsx
@@ -12,27 +12,36 @@ interface ScreenshotResponse {
     image: string;
 }
 
-export const getScreenshot = () => {
+// eslint-disable-next-line import/prefer-default-export
+export function getScreenshot() {
     const data = {
         message: EXTENSION_GET_SCREENSHOT,
     };
 
-    const promise = new Promise((resolve: (r: ScreenshotResponse) => void, reject: () => void) => {
+    const promise = new Promise((
+        resolve: (r: ScreenshotResponse) => void,
+        reject: () => void,
+    ) => {
         if (!chrome) {
             reject();
         }
 
-        chrome.runtime.sendMessage(oldExtensionId, data, (response: ScreenshotResponse) => {
-            if (!response) {
-                reject();
-            }
+        chrome.runtime.sendMessage(
+            oldExtensionId,
+            data,
+            (response: ScreenshotResponse | undefined) => {
+                if (!response) {
+                    reject();
+                    return;
+                }
 
-            resolve(response);
-        });
+                resolve(response);
+            },
+        );
     });
 
     return promise;
-};
+}
 
 export const sendToken = (token: unknown) => {
     const data = {
diff --git a/app/views/AnalyticalFramework/PrimaryTagging/index.tsx b/app/views/AnalyticalFramework/PrimaryTagging/index.tsx
index 6175282f66..adb379b439 100644
--- a/app/views/AnalyticalFramework/PrimaryTagging/index.tsx
+++ b/app/views/AnalyticalFramework/PrimaryTagging/index.tsx
@@ -360,7 +360,7 @@ function PrimaryTaggingInput<K extends string>(props: PrimaryTaggingInput<K>) {
                         widgetsDisabled={!validSectionSelected}
                     />
                 )}
-                {sectionsState.editMode && sectionEditMode && tempSections && (
+                {sectionsState.editMode && sectionEditMode && (
                     // NOTE: no need to disable as this is used as modal
                     <SectionsEditor
                         initialValue={tempSections}
@@ -371,7 +371,7 @@ function PrimaryTaggingInput<K extends string>(props: PrimaryTaggingInput<K>) {
                         onCancel={handleSectionsEditCancel}
                     />
                 )}
-                {sectionsState.editMode && widgetEditMode && tempWidget && (
+                {sectionsState.editMode && widgetEditMode && (
                     <WidgetEditor
                         className={styles.widgetEditor}
                         name={tempWidget.sectionId}
@@ -381,7 +381,7 @@ function PrimaryTaggingInput<K extends string>(props: PrimaryTaggingInput<K>) {
                         onCancel={handleWidgetEditCancel}
                     />
                 )}
-                {sectionsState.editMode && conditionalEditMode && conditional && (
+                {sectionsState.editMode && conditionalEditMode && (
                     <WidgetConditionalEditor
                         widgets={allWidgets}
                         // FIXME: we may not need to pass conditional as name
diff --git a/app/views/AnalyticalFramework/UserTable/index.tsx b/app/views/AnalyticalFramework/UserTable/index.tsx
index 3a6bf50736..62b75ece32 100644
--- a/app/views/AnalyticalFramework/UserTable/index.tsx
+++ b/app/views/AnalyticalFramework/UserTable/index.tsx
@@ -127,14 +127,14 @@ function UserTable(props: Props) {
     const [userToEdit, setUserToEdit] = useState<UserToEdit | undefined>(undefined);
 
     const handleUserEditClick = useCallback((userId: number) => {
-        const selectedUser = frameworkUsers?.results?.find((u) => u.id === userId);
+        const selectedUser = frameworkUsers?.results.find((u) => u.id === userId);
         if (!selectedUser) {
             return;
         }
         setUserToEdit({
             id: selectedUser.id,
             member: selectedUser.member,
-            memberName: selectedUser.memberDetails?.displayName,
+            memberName: selectedUser.memberDetails.displayName,
             role: selectedUser.role,
         });
         showUserAddModal();
@@ -172,27 +172,27 @@ function UserTable(props: Props) {
                 createStringColumn<User, number>(
                     'name',
                     'Name',
-                    (item) => item?.memberDetails?.displayName,
+                    (item) => item.memberDetails.displayName,
                 ),
                 createStringColumn<User, number>(
                     'organization',
                     'Organization',
-                    (item) => item?.memberDetails?.organizationTitle,
+                    (item) => item.memberDetails.organizationTitle,
                 ),
                 createStringColumn<User, number>(
                     'added_by',
                     'Added By',
-                    (item) => item?.addedByDetails?.displayName,
+                    (item) => item.addedByDetails?.displayName,
                 ),
                 createDateColumn<User, number>(
                     'joined_at',
                     'Joined By',
-                    (item) => item?.joinedAt,
+                    (item) => item.joinedAt,
                 ),
                 createStringColumn<User, number>(
                     'role',
                     'Assigned Role',
-                    (item) => item?.roleDetails?.title,
+                    (item) => item.roleDetails.title,
                 ),
                 actionColumn,
             ]);
diff --git a/app/views/AnalyticalFramework/components/Canvas/index.tsx b/app/views/AnalyticalFramework/components/Canvas/index.tsx
index 401378b211..6f50444418 100644
--- a/app/views/AnalyticalFramework/components/Canvas/index.tsx
+++ b/app/views/AnalyticalFramework/components/Canvas/index.tsx
@@ -298,8 +298,8 @@ function Canvas<T>(props: Props<T>) {
         className: _cs(
             styles.widgetContainer,
             analyzeErrors(error?.[key]) && styles.errored,
-            data?.width === 'HALF' && styles.halfWidget,
-            data?.conditional && styles.conditional,
+            data.width === 'HALF' && styles.halfWidget,
+            data.conditional && styles.conditional,
         ),
     }), [
         error,
diff --git a/app/views/AnalyticalFramework/components/WidgetConditionalEditor/DateConditionalWidgetForm/index.tsx b/app/views/AnalyticalFramework/components/WidgetConditionalEditor/DateConditionalWidgetForm/index.tsx
index 5dc2296167..72a7fafaa0 100644
--- a/app/views/AnalyticalFramework/components/WidgetConditionalEditor/DateConditionalWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/components/WidgetConditionalEditor/DateConditionalWidgetForm/index.tsx
@@ -373,7 +373,7 @@ function DateConditionalWidgetForm(props: DateConditionalWidgetFormProps) {
 
     const arrayError = getErrorObject(error?.conditions);
 
-    const totalConditions = value?.conditions?.length ?? 0;
+    const totalConditions = value.conditions?.length ?? 0;
 
     const conditionRendererParams = useCallback((
         key: string,
@@ -433,7 +433,7 @@ function DateConditionalWidgetForm(props: DateConditionalWidgetFormProps) {
                     <SortableList
                         name="conditions"
                         onChange={handleOrderChange}
-                        data={value?.conditions}
+                        data={value.conditions}
                         keySelector={conditionKeySelector}
                         renderer={ConditionInput}
                         direction="vertical"
@@ -443,12 +443,12 @@ function DateConditionalWidgetForm(props: DateConditionalWidgetFormProps) {
                         messageShown
                         messageIconShown
                     />
-                    {((value?.conditions?.length ?? 0) > 0) && (
+                    {((value.conditions?.length ?? 0) > 0) && (
                         <ConjunctionInput
                             name="add-condition"
                             value={undefined}
                             onChange={handleAdd}
-                            disabled={(value?.conditions?.length ?? 0) >= CONDITIONS_LIMIT}
+                            disabled={(value.conditions?.length ?? 0) >= CONDITIONS_LIMIT}
                         />
                     )}
                 </Container>
diff --git a/app/views/AnalyticalFramework/components/WidgetConditionalEditor/DateRangeConditionalWidgetForm/index.tsx b/app/views/AnalyticalFramework/components/WidgetConditionalEditor/DateRangeConditionalWidgetForm/index.tsx
index 93ef544cb8..1409587258 100644
--- a/app/views/AnalyticalFramework/components/WidgetConditionalEditor/DateRangeConditionalWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/components/WidgetConditionalEditor/DateRangeConditionalWidgetForm/index.tsx
@@ -373,7 +373,7 @@ function DateRangeConditionalWidgetForm(props: DateRangeConditionalWidgetFormPro
 
     const arrayError = getErrorObject(error?.conditions);
 
-    const totalConditions = value?.conditions?.length ?? 0;
+    const totalConditions = value.conditions?.length ?? 0;
 
     const conditionRendererParams = useCallback((
         key: string,
@@ -433,7 +433,7 @@ function DateRangeConditionalWidgetForm(props: DateRangeConditionalWidgetFormPro
                     <SortableList
                         name="conditions"
                         onChange={handleOrderChange}
-                        data={value?.conditions}
+                        data={value.conditions}
                         keySelector={conditionKeySelector}
                         renderer={ConditionInput}
                         direction="vertical"
@@ -443,12 +443,12 @@ function DateRangeConditionalWidgetForm(props: DateRangeConditionalWidgetFormPro
                         messageShown
                         messageIconShown
                     />
-                    {((value?.conditions?.length ?? 0) > 0) && (
+                    {((value.conditions?.length ?? 0) > 0) && (
                         <ConjunctionInput
                             name="add-condition"
                             value={undefined}
                             onChange={handleAdd}
-                            disabled={(value?.conditions?.length ?? 0) >= CONDITIONS_LIMIT}
+                            disabled={(value.conditions?.length ?? 0) >= CONDITIONS_LIMIT}
                         />
                     )}
                 </Container>
diff --git a/app/views/AnalyticalFramework/components/WidgetConditionalEditor/GeoLocationConditionalWidgetForm/index.tsx b/app/views/AnalyticalFramework/components/WidgetConditionalEditor/GeoLocationConditionalWidgetForm/index.tsx
index 34b734b4d3..40d8817f9b 100644
--- a/app/views/AnalyticalFramework/components/WidgetConditionalEditor/GeoLocationConditionalWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/components/WidgetConditionalEditor/GeoLocationConditionalWidgetForm/index.tsx
@@ -328,7 +328,7 @@ function GeoLocationConditionalWidgetForm(props: GeoLocationConditionalWidgetFor
 
     const arrayError = getErrorObject(error?.conditions);
 
-    const totalConditions = value?.conditions?.length ?? 0;
+    const totalConditions = value.conditions?.length ?? 0;
 
     const conditionRendererParams = useCallback((
         key: string,
@@ -388,7 +388,7 @@ function GeoLocationConditionalWidgetForm(props: GeoLocationConditionalWidgetFor
                     <SortableList
                         name="conditions"
                         onChange={handleOrderChange}
-                        data={value?.conditions}
+                        data={value.conditions}
                         keySelector={conditionKeySelector}
                         renderer={ConditionInput}
                         direction="vertical"
@@ -398,12 +398,12 @@ function GeoLocationConditionalWidgetForm(props: GeoLocationConditionalWidgetFor
                         messageShown
                         messageIconShown
                     />
-                    {((value?.conditions?.length ?? 0) > 0) && (
+                    {((value.conditions?.length ?? 0) > 0) && (
                         <ConjunctionInput
                             name="add-condition"
                             value={undefined}
                             onChange={handleAdd}
-                            disabled={(value?.conditions?.length ?? 0) >= CONDITIONS_LIMIT}
+                            disabled={(value.conditions?.length ?? 0) >= CONDITIONS_LIMIT}
                         />
                     )}
                 </Container>
diff --git a/app/views/AnalyticalFramework/components/WidgetConditionalEditor/Matrix1dConditionalWidgetForm/index.tsx b/app/views/AnalyticalFramework/components/WidgetConditionalEditor/Matrix1dConditionalWidgetForm/index.tsx
index 1a5f34ef54..f2f663d069 100644
--- a/app/views/AnalyticalFramework/components/WidgetConditionalEditor/Matrix1dConditionalWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/components/WidgetConditionalEditor/Matrix1dConditionalWidgetForm/index.tsx
@@ -378,7 +378,7 @@ function Matrix1dConditionalWidgetForm(props: Matrix1dConditionalWidgetFormProps
 
     const arrayError = getErrorObject(error?.conditions);
 
-    const totalConditions = value?.conditions?.length ?? 0;
+    const totalConditions = value.conditions?.length ?? 0;
 
     const conditionRendererParams = useCallback((
         key: string,
@@ -440,7 +440,7 @@ function Matrix1dConditionalWidgetForm(props: Matrix1dConditionalWidgetFormProps
                     <SortableList
                         name="conditions"
                         onChange={handleOrderChange}
-                        data={value?.conditions}
+                        data={value.conditions}
                         keySelector={conditionKeySelector}
                         renderer={ConditionInput}
                         direction="vertical"
@@ -450,12 +450,12 @@ function Matrix1dConditionalWidgetForm(props: Matrix1dConditionalWidgetFormProps
                         messageShown
                         messageIconShown
                     />
-                    {((value?.conditions?.length ?? 0) > 0) && (
+                    {((value.conditions?.length ?? 0) > 0) && (
                         <ConjunctionInput
                             name="add-condition"
                             value={undefined}
                             onChange={handleAdd}
-                            disabled={(value?.conditions?.length ?? 0) >= CONDITIONS_LIMIT}
+                            disabled={(value.conditions?.length ?? 0) >= CONDITIONS_LIMIT}
                         />
                     )}
                 </Container>
diff --git a/app/views/AnalyticalFramework/components/WidgetConditionalEditor/Matrix2dConditionalWidgetForm/index.tsx b/app/views/AnalyticalFramework/components/WidgetConditionalEditor/Matrix2dConditionalWidgetForm/index.tsx
index bc92cdfddf..ef32e10ef5 100644
--- a/app/views/AnalyticalFramework/components/WidgetConditionalEditor/Matrix2dConditionalWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/components/WidgetConditionalEditor/Matrix2dConditionalWidgetForm/index.tsx
@@ -387,7 +387,7 @@ function Matrix2dConditionalWidgetForm(props: Matrix2dConditionalWidgetFormProps
 
     const arrayError = getErrorObject(error?.conditions);
 
-    const totalConditions = value?.conditions?.length ?? 0;
+    const totalConditions = value.conditions?.length ?? 0;
 
     const conditionRendererParams = useCallback((
         key: string,
@@ -449,7 +449,7 @@ function Matrix2dConditionalWidgetForm(props: Matrix2dConditionalWidgetFormProps
                     <SortableList
                         name="conditions"
                         onChange={handleOrderChange}
-                        data={value?.conditions}
+                        data={value.conditions}
                         keySelector={conditionKeySelector}
                         renderer={ConditionInput}
                         direction="vertical"
@@ -459,12 +459,12 @@ function Matrix2dConditionalWidgetForm(props: Matrix2dConditionalWidgetFormProps
                         messageShown
                         messageIconShown
                     />
-                    {((value?.conditions?.length ?? 0) > 0) && (
+                    {((value.conditions?.length ?? 0) > 0) && (
                         <ConjunctionInput
                             name="add-condition"
                             value={undefined}
                             onChange={handleAdd}
-                            disabled={(value?.conditions?.length ?? 0) >= CONDITIONS_LIMIT}
+                            disabled={(value.conditions?.length ?? 0) >= CONDITIONS_LIMIT}
                         />
                     )}
                 </Container>
diff --git a/app/views/AnalyticalFramework/components/WidgetConditionalEditor/MultiSelectConditionalWidgetForm/index.tsx b/app/views/AnalyticalFramework/components/WidgetConditionalEditor/MultiSelectConditionalWidgetForm/index.tsx
index 724be6c2d4..a8f16a0de2 100644
--- a/app/views/AnalyticalFramework/components/WidgetConditionalEditor/MultiSelectConditionalWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/components/WidgetConditionalEditor/MultiSelectConditionalWidgetForm/index.tsx
@@ -373,7 +373,7 @@ function MultiSelectConditionalWidgetForm(props: MultiSelectConditionalWidgetFor
 
     const arrayError = getErrorObject(error?.conditions);
 
-    const totalConditions = value?.conditions?.length ?? 0;
+    const totalConditions = value.conditions?.length ?? 0;
 
     const conditionRendererParams = useCallback((
         key: string,
@@ -435,7 +435,7 @@ function MultiSelectConditionalWidgetForm(props: MultiSelectConditionalWidgetFor
                     <SortableList
                         name="conditions"
                         onChange={handleOrderChange}
-                        data={value?.conditions}
+                        data={value.conditions}
                         keySelector={conditionKeySelector}
                         renderer={ConditionInput}
                         direction="vertical"
@@ -445,12 +445,12 @@ function MultiSelectConditionalWidgetForm(props: MultiSelectConditionalWidgetFor
                         messageShown
                         messageIconShown
                     />
-                    {((value?.conditions?.length ?? 0) > 0) && (
+                    {((value.conditions?.length ?? 0) > 0) && (
                         <ConjunctionInput
                             name="add-condition"
                             value={undefined}
                             onChange={handleAdd}
-                            disabled={(value?.conditions?.length ?? 0) >= CONDITIONS_LIMIT}
+                            disabled={(value.conditions?.length ?? 0) >= CONDITIONS_LIMIT}
                         />
                     )}
                 </Container>
diff --git a/app/views/AnalyticalFramework/components/WidgetConditionalEditor/NumberConditionalWidgetForm/index.tsx b/app/views/AnalyticalFramework/components/WidgetConditionalEditor/NumberConditionalWidgetForm/index.tsx
index 3a7326ee70..c64438e1bd 100644
--- a/app/views/AnalyticalFramework/components/WidgetConditionalEditor/NumberConditionalWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/components/WidgetConditionalEditor/NumberConditionalWidgetForm/index.tsx
@@ -374,7 +374,7 @@ function NumberConditionalWidgetForm(props: NumberConditionalWidgetFormProps) {
 
     const arrayError = getErrorObject(error?.conditions);
 
-    const totalConditions = value?.conditions?.length ?? 0;
+    const totalConditions = value.conditions?.length ?? 0;
 
     const conditionRendererParams = useCallback((
         key: string,
@@ -434,7 +434,7 @@ function NumberConditionalWidgetForm(props: NumberConditionalWidgetFormProps) {
                     <SortableList
                         name="conditions"
                         onChange={handleOrderChange}
-                        data={value?.conditions}
+                        data={value.conditions}
                         keySelector={conditionKeySelector}
                         renderer={ConditionInput}
                         direction="vertical"
@@ -444,12 +444,12 @@ function NumberConditionalWidgetForm(props: NumberConditionalWidgetFormProps) {
                         messageShown
                         messageIconShown
                     />
-                    {((value?.conditions?.length ?? 0) > 0) && (
+                    {((value.conditions?.length ?? 0) > 0) && (
                         <ConjunctionInput
                             name="add-condition"
                             value={undefined}
                             onChange={handleAdd}
-                            disabled={(value?.conditions?.length ?? 0) >= CONDITIONS_LIMIT}
+                            disabled={(value.conditions?.length ?? 0) >= CONDITIONS_LIMIT}
                         />
                     )}
                 </Container>
diff --git a/app/views/AnalyticalFramework/components/WidgetConditionalEditor/OrganigramConditionalWidgetForm/index.tsx b/app/views/AnalyticalFramework/components/WidgetConditionalEditor/OrganigramConditionalWidgetForm/index.tsx
index 95c99023c3..dfd135511e 100644
--- a/app/views/AnalyticalFramework/components/WidgetConditionalEditor/OrganigramConditionalWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/components/WidgetConditionalEditor/OrganigramConditionalWidgetForm/index.tsx
@@ -373,7 +373,7 @@ function OrganigramConditionalWidgetForm(props: OrganigramConditionalWidgetFormP
 
     const arrayError = getErrorObject(error?.conditions);
 
-    const totalConditions = value?.conditions?.length ?? 0;
+    const totalConditions = value.conditions?.length ?? 0;
 
     const conditionRendererParams = useCallback((
         key: string,
@@ -435,7 +435,7 @@ function OrganigramConditionalWidgetForm(props: OrganigramConditionalWidgetFormP
                     <SortableList
                         name="conditions"
                         onChange={handleOrderChange}
-                        data={value?.conditions}
+                        data={value.conditions}
                         keySelector={conditionKeySelector}
                         renderer={ConditionInput}
                         direction="vertical"
@@ -445,12 +445,12 @@ function OrganigramConditionalWidgetForm(props: OrganigramConditionalWidgetFormP
                         messageShown
                         messageIconShown
                     />
-                    {((value?.conditions?.length ?? 0) > 0) && (
+                    {((value.conditions?.length ?? 0) > 0) && (
                         <ConjunctionInput
                             name="add-condition"
                             value={undefined}
                             onChange={handleAdd}
-                            disabled={(value?.conditions?.length ?? 0) >= CONDITIONS_LIMIT}
+                            disabled={(value.conditions?.length ?? 0) >= CONDITIONS_LIMIT}
                         />
                     )}
                 </Container>
diff --git a/app/views/AnalyticalFramework/components/WidgetConditionalEditor/ScaleConditionalWidgetForm/index.tsx b/app/views/AnalyticalFramework/components/WidgetConditionalEditor/ScaleConditionalWidgetForm/index.tsx
index d26f015a32..b7156df37e 100644
--- a/app/views/AnalyticalFramework/components/WidgetConditionalEditor/ScaleConditionalWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/components/WidgetConditionalEditor/ScaleConditionalWidgetForm/index.tsx
@@ -372,7 +372,7 @@ function ScaleConditionalWidgetForm(props: ScaleConditionalWidgetFormProps) {
 
     const arrayError = getErrorObject(error?.conditions);
 
-    const totalConditions = value?.conditions?.length ?? 0;
+    const totalConditions = value.conditions?.length ?? 0;
 
     const conditionRendererParams = useCallback((
         key: string,
@@ -434,7 +434,7 @@ function ScaleConditionalWidgetForm(props: ScaleConditionalWidgetFormProps) {
                     <SortableList
                         name="conditions"
                         onChange={handleOrderChange}
-                        data={value?.conditions}
+                        data={value.conditions}
                         keySelector={conditionKeySelector}
                         renderer={ConditionInput}
                         direction="vertical"
@@ -444,12 +444,12 @@ function ScaleConditionalWidgetForm(props: ScaleConditionalWidgetFormProps) {
                         messageShown
                         messageIconShown
                     />
-                    {((value?.conditions?.length ?? 0) > 0) && (
+                    {((value.conditions?.length ?? 0) > 0) && (
                         <ConjunctionInput
                             name="add-condition"
                             value={undefined}
                             onChange={handleAdd}
-                            disabled={(value?.conditions?.length ?? 0) >= CONDITIONS_LIMIT}
+                            disabled={(value.conditions?.length ?? 0) >= CONDITIONS_LIMIT}
                         />
                     )}
                 </Container>
diff --git a/app/views/AnalyticalFramework/components/WidgetConditionalEditor/SingleSelectConditionalWidgetForm/index.tsx b/app/views/AnalyticalFramework/components/WidgetConditionalEditor/SingleSelectConditionalWidgetForm/index.tsx
index bf0e7b186c..0fb7ac7ab3 100644
--- a/app/views/AnalyticalFramework/components/WidgetConditionalEditor/SingleSelectConditionalWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/components/WidgetConditionalEditor/SingleSelectConditionalWidgetForm/index.tsx
@@ -372,7 +372,7 @@ function SingleSelectConditionalWidgetForm(props: SingleSelectConditionalWidgetF
 
     const arrayError = getErrorObject(error?.conditions);
 
-    const totalConditions = value?.conditions?.length ?? 0;
+    const totalConditions = value.conditions?.length ?? 0;
 
     const conditionRendererParams = useCallback((
         key: string,
@@ -434,7 +434,7 @@ function SingleSelectConditionalWidgetForm(props: SingleSelectConditionalWidgetF
                     <SortableList
                         name="conditions"
                         onChange={handleOrderChange}
-                        data={value?.conditions}
+                        data={value.conditions}
                         keySelector={conditionKeySelector}
                         renderer={ConditionInput}
                         direction="vertical"
@@ -444,12 +444,12 @@ function SingleSelectConditionalWidgetForm(props: SingleSelectConditionalWidgetF
                         messageShown
                         messageIconShown
                     />
-                    {((value?.conditions?.length ?? 0) > 0) && (
+                    {((value.conditions?.length ?? 0) > 0) && (
                         <ConjunctionInput
                             name="add-condition"
                             value={undefined}
                             onChange={handleAdd}
-                            disabled={(value?.conditions?.length ?? 0) >= CONDITIONS_LIMIT}
+                            disabled={(value.conditions?.length ?? 0) >= CONDITIONS_LIMIT}
                         />
                     )}
                 </Container>
diff --git a/app/views/AnalyticalFramework/components/WidgetConditionalEditor/TextConditionalWidgetForm/index.tsx b/app/views/AnalyticalFramework/components/WidgetConditionalEditor/TextConditionalWidgetForm/index.tsx
index b656052857..2ff842db57 100644
--- a/app/views/AnalyticalFramework/components/WidgetConditionalEditor/TextConditionalWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/components/WidgetConditionalEditor/TextConditionalWidgetForm/index.tsx
@@ -373,7 +373,7 @@ function TextConditionalWidgetForm(props: TextConditionalWidgetFormProps) {
 
     const arrayError = getErrorObject(error?.conditions);
 
-    const totalConditions = value?.conditions?.length ?? 0;
+    const totalConditions = value.conditions?.length ?? 0;
 
     const conditionRendererParams = useCallback((
         key: string,
@@ -433,7 +433,7 @@ function TextConditionalWidgetForm(props: TextConditionalWidgetFormProps) {
                     <SortableList
                         name="conditions"
                         onChange={handleOrderChange}
-                        data={value?.conditions}
+                        data={value.conditions}
                         keySelector={conditionKeySelector}
                         renderer={ConditionInput}
                         direction="vertical"
@@ -443,12 +443,12 @@ function TextConditionalWidgetForm(props: TextConditionalWidgetFormProps) {
                         messageShown
                         messageIconShown
                     />
-                    {((value?.conditions?.length ?? 0) > 0) && (
+                    {((value.conditions?.length ?? 0) > 0) && (
                         <ConjunctionInput
                             name="add-condition"
                             value={undefined}
                             onChange={handleAdd}
-                            disabled={(value?.conditions?.length ?? 0) >= CONDITIONS_LIMIT}
+                            disabled={(value.conditions?.length ?? 0) >= CONDITIONS_LIMIT}
                         />
                     )}
                 </Container>
diff --git a/app/views/AnalyticalFramework/components/WidgetConditionalEditor/TimeConditionalWidgetForm/index.tsx b/app/views/AnalyticalFramework/components/WidgetConditionalEditor/TimeConditionalWidgetForm/index.tsx
index 3571c271f3..536d3f1583 100644
--- a/app/views/AnalyticalFramework/components/WidgetConditionalEditor/TimeConditionalWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/components/WidgetConditionalEditor/TimeConditionalWidgetForm/index.tsx
@@ -373,7 +373,7 @@ function TimeConditionalWidgetForm(props: TimeConditionalWidgetFormProps) {
 
     const arrayError = getErrorObject(error?.conditions);
 
-    const totalConditions = value?.conditions?.length ?? 0;
+    const totalConditions = value.conditions?.length ?? 0;
 
     const conditionRendererParams = useCallback((
         key: string,
@@ -433,7 +433,7 @@ function TimeConditionalWidgetForm(props: TimeConditionalWidgetFormProps) {
                     <SortableList
                         name="conditions"
                         onChange={handleOrderChange}
-                        data={value?.conditions}
+                        data={value.conditions}
                         keySelector={conditionKeySelector}
                         renderer={ConditionInput}
                         direction="vertical"
@@ -443,12 +443,12 @@ function TimeConditionalWidgetForm(props: TimeConditionalWidgetFormProps) {
                         messageShown
                         messageIconShown
                     />
-                    {((value?.conditions?.length ?? 0) > 0) && (
+                    {((value.conditions?.length ?? 0) > 0) && (
                         <ConjunctionInput
                             name="add-condition"
                             value={undefined}
                             onChange={handleAdd}
-                            disabled={(value?.conditions?.length ?? 0) >= CONDITIONS_LIMIT}
+                            disabled={(value.conditions?.length ?? 0) >= CONDITIONS_LIMIT}
                         />
                     )}
                 </Container>
diff --git a/app/views/AnalyticalFramework/components/WidgetConditionalEditor/TimeRangeConditionalWidgetForm/index.tsx b/app/views/AnalyticalFramework/components/WidgetConditionalEditor/TimeRangeConditionalWidgetForm/index.tsx
index 417f23c283..79abccfc0f 100644
--- a/app/views/AnalyticalFramework/components/WidgetConditionalEditor/TimeRangeConditionalWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/components/WidgetConditionalEditor/TimeRangeConditionalWidgetForm/index.tsx
@@ -373,7 +373,7 @@ function TimeRangeConditionalWidgetForm(props: TimeRangeConditionalWidgetFormPro
 
     const arrayError = getErrorObject(error?.conditions);
 
-    const totalConditions = value?.conditions?.length ?? 0;
+    const totalConditions = value.conditions?.length ?? 0;
 
     const conditionRendererParams = useCallback((
         key: string,
@@ -432,7 +432,7 @@ function TimeRangeConditionalWidgetForm(props: TimeRangeConditionalWidgetFormPro
                     <SortableList
                         name="conditions"
                         onChange={handleOrderChange}
-                        data={value?.conditions}
+                        data={value.conditions}
                         keySelector={conditionKeySelector}
                         renderer={ConditionInput}
                         direction="vertical"
@@ -442,12 +442,12 @@ function TimeRangeConditionalWidgetForm(props: TimeRangeConditionalWidgetFormPro
                         messageShown
                         messageIconShown
                     />
-                    {((value?.conditions?.length ?? 0) > 0) && (
+                    {((value.conditions?.length ?? 0) > 0) && (
                         <ConjunctionInput
                             name="add-condition"
                             value={undefined}
                             onChange={handleAdd}
-                            disabled={(value?.conditions?.length ?? 0) >= CONDITIONS_LIMIT}
+                            disabled={(value.conditions?.length ?? 0) >= CONDITIONS_LIMIT}
                         />
                     )}
                 </Container>
diff --git a/app/views/AnalyticalFramework/components/WidgetEditor/OrganigramWidgetForm/index.tsx b/app/views/AnalyticalFramework/components/WidgetEditor/OrganigramWidgetForm/index.tsx
index b1f5a2e275..f5bbe0c7b7 100644
--- a/app/views/AnalyticalFramework/components/WidgetEditor/OrganigramWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/components/WidgetEditor/OrganigramWidgetForm/index.tsx
@@ -140,7 +140,7 @@ function NodeInput(props: NodeInputProps) {
     const arrayError = getErrorObject(error?.children);
 
     const errored = analyzeErrors(error);
-    const heading = value?.label ?? `Option ${index + 1}`;
+    const heading = value.label ?? `Option ${index + 1}`;
     const {
         setValue: onSiblingChange,
         removeValue: onSiblingRemove,
@@ -148,7 +148,7 @@ function NodeInput(props: NodeInputProps) {
 
     const handleAdd = useCallback(
         () => {
-            const oldNodes = value?.children ?? [];
+            const oldNodes = value.children ?? [];
             const key = randomString();
             newlyCreatedNodeIdRef.current = key;
             const newNode: PartialNodeType = {
@@ -156,7 +156,7 @@ function NodeInput(props: NodeInputProps) {
                 order: oldNodes.length + 1,
             };
             setExpandedNodeId(newNode.key);
-            onExpansionChange(true, value?.key);
+            onExpansionChange(true, value.key);
             onFieldChange(
                 [...reorder(oldNodes), newNode],
                 'children' as const,
@@ -164,9 +164,9 @@ function NodeInput(props: NodeInputProps) {
         },
         [
             onFieldChange,
-            value?.children,
+            value.children,
             onExpansionChange,
-            value?.key,
+            value.key,
         ],
     );
 
@@ -206,7 +206,7 @@ function NodeInput(props: NodeInputProps) {
 
     return (
         <ControlledExpandableContainer
-            name={value?.key}
+            name={value.key}
             className={className}
             heading={`${heading} ${errored ? '*' : ''}`}
             headingSize="extraSmall"
@@ -227,7 +227,7 @@ function NodeInput(props: NodeInputProps) {
                     <GrDrag />
                 </QuickActionButton>
             )}
-            headerActions={(value?.children?.length ?? 0) < OPTIONS_LIMIT && (
+            headerActions={(value.children?.length ?? 0) < OPTIONS_LIMIT && (
                 <>
                     <QuickActionButton
                         name={undefined}
@@ -255,7 +255,7 @@ function NodeInput(props: NodeInputProps) {
                 // FIXME: use translation
                 label="Label"
                 name="label"
-                value={value?.label}
+                value={value.label}
                 onChange={onFieldChange}
                 error={error?.label}
             />
@@ -265,7 +265,7 @@ function NodeInput(props: NodeInputProps) {
                 label="Tooltip"
                 name="tooltip"
                 rows={2}
-                value={value?.tooltip}
+                value={value.tooltip}
                 onChange={onFieldChange}
                 error={error?.tooltip}
             />
@@ -273,7 +273,7 @@ function NodeInput(props: NodeInputProps) {
                 name="children"
                 className={styles.sortableList}
                 onChange={handleOrderChange}
-                data={value?.children}
+                data={value.children}
                 keySelector={optionKeySelector}
                 renderer={NodeInput}
                 direction="vertical"
diff --git a/app/views/AnalyticalFramework/index.tsx b/app/views/AnalyticalFramework/index.tsx
index 52af9f288b..7ef13a3b48 100644
--- a/app/views/AnalyticalFramework/index.tsx
+++ b/app/views/AnalyticalFramework/index.tsx
@@ -250,9 +250,9 @@ function AnalyticalFramework(props: Props) {
                 // eslint-disable-next-line max-len
                 if (framework && (!storedData || getTimestamp(framework.modifiedAt) > getTimestamp(storedData.framework.modifiedAt))) {
                     setValue(transformFramework(framework));
-                    setFrameworkImage(framework?.previewImage);
+                    setFrameworkImage(framework.previewImage);
                     setOrganizationOptions(
-                        framework?.organization
+                        framework.organization
                             ? [framework.organization]
                             : [],
                     );
@@ -283,7 +283,7 @@ function AnalyticalFramework(props: Props) {
         CREATE_FRAMEWORK,
         {
             onCompleted: (response) => {
-                if (!response?.analysisFrameworkCreate) {
+                if (!response.analysisFrameworkCreate) {
                     return;
                 }
                 const {
@@ -336,7 +336,7 @@ function AnalyticalFramework(props: Props) {
         UPDATE_FRAMEWORK,
         {
             onCompleted: (response) => {
-                if (!response?.analysisFramework?.analysisFrameworkUpdate) {
+                if (!response.analysisFramework?.analysisFrameworkUpdate) {
                     return;
                 }
                 const {
@@ -651,7 +651,7 @@ function AnalyticalFramework(props: Props) {
     }
 
     const framework = (frameworkQueryData?.analysisFramework ?? undefined) as Framework | undefined;
-    const hasPermission = createMode || framework?.allowedPermissions?.includes('CAN_EDIT_FRAMEWORK');
+    const hasPermission = createMode || framework?.allowedPermissions.includes('CAN_EDIT_FRAMEWORK');
 
     return (
         <div className={_cs(styles.analyticalFramework, className)}>
@@ -772,7 +772,7 @@ function AnalyticalFramework(props: Props) {
                                             <DateInput
                                                 className={styles.createdOn}
                                                 name="createdAt"
-                                                value={framework?.createdAt?.split('T')[0]}
+                                                value={framework?.createdAt.split('T')[0]}
                                                 disabled
                                                 label={_ts('analyticalFramework', 'createdOn')}
                                             />
@@ -885,7 +885,7 @@ function AnalyticalFramework(props: Props) {
                                         allWidgets={allWidgets}
                                         name="properties"
                                         onChange={handlePropertiesChange}
-                                        value={value?.properties}
+                                        value={value.properties}
                                         error={error?.properties}
                                         disabled={pending}
                                     />
diff --git a/app/views/AnalyticalFramework/utils.ts b/app/views/AnalyticalFramework/utils.ts
index 165372e259..22194061f4 100644
--- a/app/views/AnalyticalFramework/utils.ts
+++ b/app/views/AnalyticalFramework/utils.ts
@@ -37,7 +37,7 @@ function cloneScaleWidget(widget: ScaleWidget): ScaleWidget {
     // NOTE: remembering index to get defaultOption after transformation
     const defaultOptionIndex = widget.properties.options.findIndex((o) => (
         o.key === widget.properties?.defaultValue
-    )) ?? -1;
+    ));
 
     const clonedOptions = widget.properties.options.map(cloneOption);
 
@@ -46,7 +46,7 @@ function cloneScaleWidget(widget: ScaleWidget): ScaleWidget {
         properties: {
             ...widget.properties,
             options: clonedOptions,
-            defaultValue: defaultOptionIndex !== -1 && clonedOptions
+            defaultValue: defaultOptionIndex !== -1
                 ? clonedOptions[defaultOptionIndex]?.key
                 : undefined,
         },
@@ -58,7 +58,7 @@ function cloneMultiSelectionWidget(widget: MultiSelectWidget): MultiSelectWidget
         ...widget,
         properties: widget.properties ? {
             ...widget.properties,
-            options: widget.properties?.options.map(cloneOption),
+            options: widget.properties.options.map(cloneOption),
         } : undefined,
     });
 }
@@ -68,7 +68,7 @@ function cloneSingleSelectionWidget(widget: SingleSelectWidget): SingleSelectWid
         ...widget,
         properties: widget.properties ? {
             ...widget.properties,
-            options: widget.properties?.options.map(cloneOption),
+            options: widget.properties.options.map(cloneOption),
         } : undefined,
     });
 }
@@ -95,7 +95,7 @@ function cloneMatrix1dWidget(widget: Matrix1dWidget): Matrix1dWidget {
         ...widget,
         properties: widget.properties ? {
             ...widget.properties,
-            rows: widget.properties?.rows.map((row) => (
+            rows: widget.properties.rows.map((row) => (
                 cloneOption({
                     ...row,
                     cells: row.cells.map(cloneOption),
@@ -110,13 +110,13 @@ function cloneMatrix2dWidget(widget: Matrix2dWidget): Matrix2dWidget {
         ...widget,
         properties: widget.properties ? {
             ...widget.properties,
-            rows: widget.properties?.rows.map((row) => (
+            rows: widget.properties.rows.map((row) => (
                 cloneOption({
                     ...row,
                     subRows: row.subRows.map(cloneOption),
                 })
             )),
-            columns: widget.properties?.columns.map((column) => (
+            columns: widget.properties.columns.map((column) => (
                 cloneOption({
                     ...column,
                     subColumns: column.subColumns.map(cloneOption),
diff --git a/app/views/ExploreDeep/ActionCell/ProjectJoinModal/index.tsx b/app/views/ExploreDeep/ActionCell/ProjectJoinModal/index.tsx
index 72aefb9231..1ac78164ce 100644
--- a/app/views/ExploreDeep/ActionCell/ProjectJoinModal/index.tsx
+++ b/app/views/ExploreDeep/ActionCell/ProjectJoinModal/index.tsx
@@ -112,7 +112,7 @@ function ProjectJoinModal(props: Props) {
                     if (formError?.project) {
                         setError({
                             ...formError,
-                            [internal]: formError?.project as string,
+                            [internal]: formError.project as string,
                         });
                     } else {
                         setError(formError);
diff --git a/app/views/ExploreDeep/MapView/ProjectList/index.tsx b/app/views/ExploreDeep/MapView/ProjectList/index.tsx
index 5119b6e822..4191bd217d 100644
--- a/app/views/ExploreDeep/MapView/ProjectList/index.tsx
+++ b/app/views/ExploreDeep/MapView/ProjectList/index.tsx
@@ -112,9 +112,9 @@ function ListRenderer(props: ProjectListProps) {
             <ActionCell
                 className={styles.joinButton}
                 projectId={projectId}
-                membershipPending={projectDetails?.membershipPending}
+                membershipPending={projectDetails.membershipPending}
                 isRejected={isRejected}
-                isMember={!!projectDetails?.currentUserRole}
+                isMember={!!projectDetails.currentUserRole}
                 onMemberStatusChange={refetchProjectDetails}
                 variant="primary"
             />
@@ -159,17 +159,17 @@ function ProjectList(props: Props) {
     }, []);
 
     const rendererParams = useCallback((_: string, datum: ProjectDetail): ProjectListProps => ({
-        projectId: datum?.id,
+        projectId: datum.id,
         projectDetails: datum,
-        projectTitle: datum?.title,
+        projectTitle: datum.title,
         isRejected: datum.isRejected,
-        description: datum?.description,
-        frameworkId: datum?.analysisFramework?.id,
-        frameworkTitle: datum?.analysisFramework?.title,
-        createdAt: datum?.createdAt ?? undefined,
-        numberOfEntries: datum?.stats?.numberOfEntries ?? 0,
-        numberOfLeads: datum?.stats?.numberOfLeads ?? 0,
-        numberOfUsers: datum?.stats?.numberOfUsers ?? 0,
+        description: datum.description,
+        frameworkId: datum.analysisFramework?.id,
+        frameworkTitle: datum.analysisFramework?.title,
+        createdAt: datum.createdAt,
+        numberOfEntries: datum.stats?.numberOfEntries ?? 0,
+        numberOfLeads: datum.stats?.numberOfLeads ?? 0,
+        numberOfUsers: datum.stats?.numberOfUsers ?? 0,
         onExpansionChange: handleExpansionChange,
         expanded: expandedProjectId === datum.id,
         refetchProjectDetails,
diff --git a/app/views/ExploreDeep/MapView/index.tsx b/app/views/ExploreDeep/MapView/index.tsx
index 67fa284209..96e9b6e1d2 100644
--- a/app/views/ExploreDeep/MapView/index.tsx
+++ b/app/views/ExploreDeep/MapView/index.tsx
@@ -227,7 +227,7 @@ function ExploreDeepMapView(props: Props) {
         if (feature.properties) {
             // eslint-disable-next-line camelcase
             const { cluster_id, point_count } = feature.properties as ClusterProperties;
-            const clusterSource = map.getSource('region') as mapboxgl.GeoJSONSource;
+            const clusterSource = map.getSource('region') as mapboxgl.GeoJSONSource | undefined;
             if (clusterSource) {
                 clusterSource.getClusterLeaves(
                     cluster_id,
@@ -236,7 +236,7 @@ function ExploreDeepMapView(props: Props) {
                     (___, aFeatures) => {
                         if (aFeatures) {
                             const projectIds = aFeatures
-                                .map((f) => f?.properties?.projectId)
+                                .map((f) => f.properties?.projectId)
                                 .filter(isDefined);
                             setPage(1);
                             setClickedFeatureProperties(projectIds);
diff --git a/app/views/ExploreDeep/ProjectFilterForm/index.tsx b/app/views/ExploreDeep/ProjectFilterForm/index.tsx
index 4e0e1b39dd..559eb50e57 100644
--- a/app/views/ExploreDeep/ProjectFilterForm/index.tsx
+++ b/app/views/ExploreDeep/ProjectFilterForm/index.tsx
@@ -96,26 +96,26 @@ function ProjectFilterForm(props: Props) {
             <TextInput
                 name="search"
                 label="Search"
-                value={value?.search}
+                value={value.search}
                 onChange={setFieldValue}
                 placeholder="any"
             />
             <DateInput
                 name="startDate"
                 label="Start Date"
-                value={value?.startDate}
+                value={value.startDate}
                 onChange={setFieldValue}
             />
             <DateInput
                 name="endDate"
                 label="End Date"
-                value={value?.endDate}
+                value={value.endDate}
                 onChange={setFieldValue}
             />
             <PublicOrganizationMultiSelectInput
                 name="organizations"
                 label="Organizations"
-                value={value?.organizations}
+                value={value.organizations}
                 onChange={setFieldValue}
                 options={organizationOptions}
                 onOptionsChange={setOrganizationOptions}
@@ -125,7 +125,7 @@ function ProjectFilterForm(props: Props) {
                 name="analysisFrameworks"
                 label="Analysis Frameworks"
                 placeholder="any"
-                value={value?.analysisFrameworks}
+                value={value.analysisFrameworks}
                 onChange={setFieldValue}
                 options={analysisFrameworkOptions}
                 onOptionsChange={setAnalysisFrameworkOptions}
diff --git a/app/views/ExploreDeep/PublicMapView/ProjectList/index.tsx b/app/views/ExploreDeep/PublicMapView/ProjectList/index.tsx
index e281a7deac..904dec670b 100644
--- a/app/views/ExploreDeep/PublicMapView/ProjectList/index.tsx
+++ b/app/views/ExploreDeep/PublicMapView/ProjectList/index.tsx
@@ -140,15 +140,15 @@ function ProjectList(props: Props) {
     }, []);
 
     const rendererParams = useCallback((_: string, datum: ProjectDetail): ProjectListProps => ({
-        projectId: datum?.id,
-        projectTitle: datum?.title,
-        description: datum?.description,
-        frameworkTitle: datum?.analysisFrameworkTitle ?? undefined,
-        frameworkPreviewImage: datum?.analysisFrameworkPreviewImage ?? undefined,
-        createdAt: datum?.createdAt ?? undefined,
-        numberOfEntries: datum?.numberOfEntries ?? 0,
-        numberOfLeads: datum?.numberOfLeads ?? 0,
-        numberOfUsers: datum?.numberOfUsers ?? 0,
+        projectId: datum.id,
+        projectTitle: datum.title,
+        description: datum.description,
+        frameworkTitle: datum.analysisFrameworkTitle ?? undefined,
+        frameworkPreviewImage: datum.analysisFrameworkPreviewImage ?? undefined,
+        createdAt: datum.createdAt,
+        numberOfEntries: datum.numberOfEntries,
+        numberOfLeads: datum.numberOfLeads,
+        numberOfUsers: datum.numberOfUsers,
         onExpansionChange: handleExpansionChange,
         expanded: expandedProjectId === datum.id,
     }), [
diff --git a/app/views/ExploreDeep/PublicMapView/index.tsx b/app/views/ExploreDeep/PublicMapView/index.tsx
index a6dc966d67..53688ab7a1 100644
--- a/app/views/ExploreDeep/PublicMapView/index.tsx
+++ b/app/views/ExploreDeep/PublicMapView/index.tsx
@@ -218,7 +218,7 @@ function ExploreDeepMapView(props: Props) {
         if (feature.properties) {
             // eslint-disable-next-line camelcase
             const { cluster_id, point_count } = feature.properties as ClusterProperties;
-            const clusterSource = map.getSource('region') as mapboxgl.GeoJSONSource;
+            const clusterSource = map.getSource('region') as mapboxgl.GeoJSONSource | undefined;
             if (clusterSource) {
                 clusterSource.getClusterLeaves(
                     cluster_id,
@@ -227,7 +227,7 @@ function ExploreDeepMapView(props: Props) {
                     (___, aFeatures) => {
                         if (aFeatures) {
                             const projectIds = aFeatures
-                                .map((f) => f?.properties?.projectId)
+                                .map((f) => f.properties?.projectId)
                                 .filter(isDefined);
                             setClickedFeatureProperties(projectIds);
                         }
diff --git a/app/views/ExploreDeep/PublicTableView/index.tsx b/app/views/ExploreDeep/PublicTableView/index.tsx
index e1b3de8c73..24101a4add 100644
--- a/app/views/ExploreDeep/PublicTableView/index.tsx
+++ b/app/views/ExploreDeep/PublicTableView/index.tsx
@@ -108,12 +108,12 @@ function ExploreDeepTableView(props: Props) {
         createStringColumn<Project, string>(
             'location',
             'Location',
-            (item) => item?.regionsTitle,
+            (item) => item.regionsTitle,
         ),
         createDateColumn<Project, string>(
             'created_at',
             'Created At',
-            (item) => item?.createdAt,
+            (item) => item.createdAt,
             {
                 columnWidth: 116,
             },
@@ -121,12 +121,12 @@ function ExploreDeepTableView(props: Props) {
         createStringColumn<Project, string>(
             'framework',
             'Analytical Framework',
-            (item) => item?.analysisFrameworkTitle,
+            (item) => item.analysisFrameworkTitle,
         ),
         createNumberColumn<Project, string>(
             'members_count',
             'Users',
-            (item) => item?.numberOfUsers,
+            (item) => item.numberOfUsers,
             {
                 columnWidth: 96,
             },
@@ -134,7 +134,7 @@ function ExploreDeepTableView(props: Props) {
         createNumberColumn<Project, string>(
             'sources_count',
             'Sources',
-            (item) => item?.numberOfLeads,
+            (item) => item.numberOfLeads,
             {
                 columnWidth: 96,
             },
@@ -142,7 +142,7 @@ function ExploreDeepTableView(props: Props) {
         createStringColumn<Project, string>(
             'organizations',
             'Organizations',
-            (item) => item?.organizationsTitle,
+            (item) => item.organizationsTitle,
         ),
     ]), []);
 
diff --git a/app/views/ExploreDeep/TableView/index.tsx b/app/views/ExploreDeep/TableView/index.tsx
index 825bb39c9e..ff8d329fab 100644
--- a/app/views/ExploreDeep/TableView/index.tsx
+++ b/app/views/ExploreDeep/TableView/index.tsx
@@ -138,8 +138,8 @@ function ExploreDeepTableView(props: Props) {
             },
             cellRenderer: FrameworkImageButton,
             cellRendererParams: (_, project) => ({
-                frameworkId: project?.analysisFramework?.id,
-                label: project?.analysisFramework?.title,
+                frameworkId: project.analysisFramework?.id,
+                label: project.analysisFramework?.title,
             }),
         };
 
@@ -155,9 +155,9 @@ function ExploreDeepTableView(props: Props) {
             cellRenderer: ActionCell,
             cellRendererParams: (projectId, project) => ({
                 projectId,
-                isRejected: project?.isRejected,
-                membershipPending: project?.membershipPending,
-                isMember: !!project?.currentUserRole,
+                isRejected: project.isRejected,
+                membershipPending: project.membershipPending,
+                isMember: !!project.currentUserRole,
                 onMemberStatusChange: refetch,
             }),
             columnWidth: 156,
@@ -172,12 +172,12 @@ function ExploreDeepTableView(props: Props) {
             createStringColumn<Project, string>(
                 'location',
                 'Location',
-                (item) => item?.regions?.map((region) => region.title)?.join(', '),
+                (item) => item.regions?.map((region) => region.title)?.join(', '),
             ),
             createDateColumn<Project, string>(
                 'created_at',
                 'Created At',
-                (item) => item?.createdAt,
+                (item) => item.createdAt,
                 {
                     columnWidth: 116,
                 },
@@ -186,7 +186,7 @@ function ExploreDeepTableView(props: Props) {
             createNumberColumn<Project, string>(
                 'members_count',
                 'Users',
-                (item) => item?.stats?.numberOfUsers,
+                (item) => item.stats?.numberOfUsers,
                 {
                     columnWidth: 96,
                 },
@@ -194,7 +194,7 @@ function ExploreDeepTableView(props: Props) {
             createNumberColumn<Project, string>(
                 'sources_count',
                 'Sources',
-                (item) => item?.stats?.numberOfLeads,
+                (item) => item.stats?.numberOfLeads,
                 {
                     columnWidth: 96,
                 },
@@ -202,7 +202,7 @@ function ExploreDeepTableView(props: Props) {
             createStringColumn<Project, string>(
                 'organizations',
                 'Organizations',
-                (item) => item?.organizations?.map((org) => organizationTitleSelector(org.organization))?.join(', '),
+                (item) => item.organizations?.map((org) => organizationTitleSelector(org.organization))?.join(', '),
             ),
             actionsColumn,
         ]);
diff --git a/app/views/ExploreDeep/index.tsx b/app/views/ExploreDeep/index.tsx
index 64d154b733..4472194734 100644
--- a/app/views/ExploreDeep/index.tsx
+++ b/app/views/ExploreDeep/index.tsx
@@ -113,8 +113,8 @@ function ExploreDeep(props: Props) {
     const activeFrameworkRendererParams = useCallback(
         (_: string, datum: ActiveFramework): ActiveFrameworkItemProps => ({
             frameworkTitle: datum.analysisFrameworkTitle ?? undefined,
-            projectCount: datum.projectCount ?? undefined,
-            sourceCount: datum.sourceCount ?? undefined,
+            projectCount: datum.projectCount,
+            sourceCount: datum.sourceCount,
         }),
         [],
     );
diff --git a/app/views/ForgotPassword/ForgotPasswordForm/index.tsx b/app/views/ForgotPassword/ForgotPasswordForm/index.tsx
index e91a9deb8a..cc77e85063 100644
--- a/app/views/ForgotPassword/ForgotPasswordForm/index.tsx
+++ b/app/views/ForgotPassword/ForgotPasswordForm/index.tsx
@@ -160,7 +160,7 @@ function ForgotPasswordModal(props: Props) {
                         <TextInput
                             name="email"
                             onChange={setFieldValue}
-                            value={value?.email}
+                            value={value.email}
                             error={error?.email}
                             label={_ts('explore.passwordReset', 'emailLabel')}
                             placeholder={_ts('explore.passwordReset', 'emailPlaceholder')}
diff --git a/app/views/Home/Assignment/AssignmentItem/index.tsx b/app/views/Home/Assignment/AssignmentItem/index.tsx
index 0a3c3b9b0b..bcaf43800e 100644
--- a/app/views/Home/Assignment/AssignmentItem/index.tsx
+++ b/app/views/Home/Assignment/AssignmentItem/index.tsx
@@ -40,7 +40,7 @@ function AssignmentItem(props: AssignmentItemProps) {
             return (generateString(
                 'source {link}',
                 {
-                    link: (contentObjectDetails?.id && projectDetails?.id && (
+                    link: (contentObjectDetails.id && projectDetails.id && (
                         <Link
                             to={generatePath(routes.entryEdit.path, {
                                 projectId: projectDetails.id,
@@ -55,7 +55,7 @@ function AssignmentItem(props: AssignmentItemProps) {
             ));
         }
         if (contentObjectType === 'entryreviewcomment' || contentObjectType === 'entrycomment') {
-            if (!projectDetails?.id && contentObjectDetails?.lead) {
+            if (!projectDetails.id && contentObjectDetails.lead) {
                 return (
                     <span>
                         an entry
@@ -114,11 +114,11 @@ function AssignmentItem(props: AssignmentItemProps) {
                             <Link
                                 to={generatePath(
                                     routes.tagging.path,
-                                    { projectId: projectDetails?.id },
+                                    { projectId: projectDetails.id },
                                 )}
                                 className={styles.link}
                             >
-                                {projectDetails?.title}
+                                {projectDetails.title}
                             </Link>
                         ),
                     },
diff --git a/app/views/Home/ProjectItem/index.tsx b/app/views/Home/ProjectItem/index.tsx
index d7afd5683e..be03980158 100644
--- a/app/views/Home/ProjectItem/index.tsx
+++ b/app/views/Home/ProjectItem/index.tsx
@@ -59,7 +59,7 @@ const minTickFormatter = (value: number | string) => {
     return new Intl.DateTimeFormat('en-GB', { dateStyle: 'medium' }).format(date);
 };
 
-const topUserKeySelector = (d: UserEntityCountType) => d?.id ?? '';
+const topUserKeySelector = (d: UserEntityCountType) => d.id ?? '';
 
 export interface RecentProjectItemProps {
     className?: string;
diff --git a/app/views/Login/LoginForm/index.tsx b/app/views/Login/LoginForm/index.tsx
index f3873147ab..d8512e4b5f 100644
--- a/app/views/Login/LoginForm/index.tsx
+++ b/app/views/Login/LoginForm/index.tsx
@@ -249,7 +249,7 @@ function LoginForm(props: Props) {
         // Get params from the current url
         // NOTE: hid provides query as hash
 
-        const query = parseUrlParams(window.location?.hash?.replace('#', '')) as { access_token?: string };
+        const query = parseUrlParams(window.location.hash.replace('#', '')) as { access_token?: string };
         // Login User with HID access_token
         if (query.access_token) {
             const hidQuery = query as HidQuery;
@@ -306,7 +306,7 @@ function LoginForm(props: Props) {
                 <TextInput
                     name="email"
                     onChange={setFieldValue}
-                    value={value?.email}
+                    value={value.email}
                     error={error?.email}
                     placeholder={_ts('explore.login', 'emailPlaceholder')}
                     disabled={pending}
@@ -315,7 +315,7 @@ function LoginForm(props: Props) {
                 <PasswordInput
                     name="password"
                     onChange={setFieldValue}
-                    value={value?.password}
+                    value={value.password}
                     error={error?.password}
                     placeholder={_ts('explore.login', 'password')}
                     disabled={pending}
@@ -323,7 +323,7 @@ function LoginForm(props: Props) {
                 <SmartButtonLikeLink
                     className={styles.forgetPasswordButton}
                     route={routes.forgotPassword}
-                    state={{ email: value?.email }}
+                    state={{ email: value.email }}
                     variant="action"
                     actions={(
                         <IoChevronForwardSharp />
diff --git a/app/views/MyProfile/ChangePasswordModal/index.tsx b/app/views/MyProfile/ChangePasswordModal/index.tsx
index c71a171c5d..f0d9ff1261 100644
--- a/app/views/MyProfile/ChangePasswordModal/index.tsx
+++ b/app/views/MyProfile/ChangePasswordModal/index.tsx
@@ -40,7 +40,7 @@ function sameWithPasswordCondition(
     value: PartialForm<FormType>,
 ) {
     if (
-        isTruthyString(value?.newPassword)
+        isTruthyString(value.newPassword)
         && isTruthyString(password)
         && value.newPassword !== password
     ) {
diff --git a/app/views/Project/AnalysisModule/Analysis/AnalysisCloneModal/index.tsx b/app/views/Project/AnalysisModule/Analysis/AnalysisCloneModal/index.tsx
index b693eb3965..1c0dba6295 100644
--- a/app/views/Project/AnalysisModule/Analysis/AnalysisCloneModal/index.tsx
+++ b/app/views/Project/AnalysisModule/Analysis/AnalysisCloneModal/index.tsx
@@ -44,7 +44,7 @@ const schema: FormSchema = {
     validation: (value) => {
         if (
             value?.startDate
-            && value?.endDate
+            && value.endDate
             && (compareDate(value.startDate, value.endDate) > 0)
         ) {
             return (_ts('analysis.cloneModal', 'endDateGreaterThanStartDate'));
diff --git a/app/views/Project/AnalysisModule/Analysis/AnalysisPillar/index.tsx b/app/views/Project/AnalysisModule/Analysis/AnalysisPillar/index.tsx
index 935f23144c..a1acec9016 100644
--- a/app/views/Project/AnalysisModule/Analysis/AnalysisPillar/index.tsx
+++ b/app/views/Project/AnalysisModule/Analysis/AnalysisPillar/index.tsx
@@ -64,7 +64,7 @@ function AnalysisPillar(props: Props) {
     } = useContext(ProjectContext);
 
     // NOTE: using entry delete permission for analysis pillar
-    const canDeleteAnalysisPillar = project?.allowedPermissions?.includes('DELETE_ENTRY');
+    const canDeleteAnalysisPillar = project?.allowedPermissions.includes('DELETE_ENTRY');
 
     const isAnalysisCompleted = analyzedEntries === totalEntries && totalEntries > 0;
     let statusLabel = _ts('analysis', 'inProgressTagLabel');
diff --git a/app/views/Project/AnalysisModule/Analysis/PillarList/index.tsx b/app/views/Project/AnalysisModule/Analysis/PillarList/index.tsx
index c2169ed560..7cd583cc0c 100644
--- a/app/views/Project/AnalysisModule/Analysis/PillarList/index.tsx
+++ b/app/views/Project/AnalysisModule/Analysis/PillarList/index.tsx
@@ -96,7 +96,7 @@ function AnalysisDetails(props: Props) {
         (_, data: PillarSummary): PillarComponentProps => ({
             className: styles.pillar,
             analysisId,
-            assigneeName: data.assigneeDetails?.displayName,
+            assigneeName: data.assigneeDetails.displayName,
             createdAt,
             onDelete: triggerPillarDelete,
             statements: data.analyticalStatements,
diff --git a/app/views/Project/AnalysisModule/Analysis/index.tsx b/app/views/Project/AnalysisModule/Analysis/index.tsx
index 9366a55438..f33a95a788 100644
--- a/app/views/Project/AnalysisModule/Analysis/index.tsx
+++ b/app/views/Project/AnalysisModule/Analysis/index.tsx
@@ -166,7 +166,7 @@ function Analysis(props: ComponentProps) {
     }, [onAnalysisCloseSuccess, setModalHidden]);
 
     const canTagEntry = project?.analysisFramework?.id
-        && project?.allowedPermissions?.includes('UPDATE_ENTRY');
+        && project.allowedPermissions.includes('UPDATE_ENTRY');
 
     return (
         <ContainerCard
diff --git a/app/views/Project/AnalysisModule/AnalysisEditModal/index.tsx b/app/views/Project/AnalysisModule/AnalysisEditModal/index.tsx
index 53fcbf37e8..c2ae523888 100644
--- a/app/views/Project/AnalysisModule/AnalysisEditModal/index.tsx
+++ b/app/views/Project/AnalysisModule/AnalysisEditModal/index.tsx
@@ -275,9 +275,7 @@ function AnalysisEditModal(props: AnalysisEditModalProps) {
         method: isDefined(analysisToEdit) ? 'PATCH' : 'POST',
         body: (ctx) => ctx,
         onSuccess: (response) => {
-            if (response) {
-                onSuccess(response, isDefined(analysisToEdit));
-            }
+            onSuccess(response, isDefined(analysisToEdit));
             alert.show(
                 isDefined(analysisToEdit)
                     ? 'Successfully updated analysis.'
@@ -342,7 +340,7 @@ function AnalysisEditModal(props: AnalysisEditModalProps) {
                 );
                 triggerAnalysisEdit({
                     ...finalValue,
-                    analysisPillar: finalValue?.analysisPillar?.map((ap) => ({
+                    analysisPillar: finalValue.analysisPillar?.map((ap) => ({
                         ...ap,
                         filters: ap.filters?.map((f) => matrixMap[f]),
                     })),
diff --git a/app/views/Project/AnalysisModule/index.tsx b/app/views/Project/AnalysisModule/index.tsx
index ccb0450506..592e0a105f 100644
--- a/app/views/Project/AnalysisModule/index.tsx
+++ b/app/views/Project/AnalysisModule/index.tsx
@@ -219,7 +219,7 @@ function AnalysisModule(props: AnalysisModuleProps) {
 
     const timelineData: TimelineData[] = useMemo(
         () => (
-            overviewResponse?.analysisList?.map((d) => ({
+            overviewResponse?.analysisList.map((d) => ({
                 key: d.id,
                 value: new Date(d.createdAt).getTime(),
                 label: d.title,
@@ -253,7 +253,7 @@ function AnalysisModule(props: AnalysisModuleProps) {
         title: data.title,
         startDate: data.startDate,
         endDate: data.endDate,
-        teamLeadName: data.teamLeadDetails?.displayName,
+        teamLeadName: data.teamLeadDetails.displayName,
         createdAt: data.createdAt,
         modifiedAt: data.modifiedAt,
         pillars: data.pillars,
@@ -274,7 +274,7 @@ function AnalysisModule(props: AnalysisModuleProps) {
         pendingAnalyses,
     ]);
 
-    const canTagEntry = project?.allowedPermissions?.includes('UPDATE_ENTRY');
+    const canTagEntry = project?.allowedPermissions.includes('UPDATE_ENTRY');
 
     return (
         <SubNavbarContext.Provider value={navbarContextValue}>
@@ -344,7 +344,7 @@ function AnalysisModule(props: AnalysisModuleProps) {
                             footerContent={_ts('analysis', 'sourcesByTypeLabel')}
                             contentClassName={styles.pieChartContent}
                         >
-                            { piechartData?.length > 0 ? (
+                            { piechartData.length > 0 ? (
                                 <ResponsiveContainer>
                                     <PieChart>
                                         <Pie
@@ -387,7 +387,7 @@ function AnalysisModule(props: AnalysisModuleProps) {
                             )}
                         </ContainerCard>
                         <Card className={styles.analysesTimelineContainer}>
-                            {timelineData?.length > 0 ? (
+                            {timelineData.length > 0 ? (
                                 <Timeline
                                     data={timelineData}
                                     labelSelector={timelineLabelSelector}
diff --git a/app/views/Project/EntryEdit/LeftPane/EntryItem/index.tsx b/app/views/Project/EntryEdit/LeftPane/EntryItem/index.tsx
index 48cb3b0187..67395767b4 100644
--- a/app/views/Project/EntryEdit/LeftPane/EntryItem/index.tsx
+++ b/app/views/Project/EntryEdit/LeftPane/EntryItem/index.tsx
@@ -141,7 +141,7 @@ function EntryItem(props: EntryItemProps) {
                 onExcerptChange(entryId, modifiedExcerpt);
             }
 
-            if (editExcerptDropdownRef?.current) {
+            if (editExcerptDropdownRef.current) {
                 editExcerptDropdownRef.current.setShowPopup(false);
             }
         },
diff --git a/app/views/Project/EntryEdit/LeftPane/index.tsx b/app/views/Project/EntryEdit/LeftPane/index.tsx
index 315d61d66b..196954b22a 100644
--- a/app/views/Project/EntryEdit/LeftPane/index.tsx
+++ b/app/views/Project/EntryEdit/LeftPane/index.tsx
@@ -254,7 +254,7 @@ function LeftPane(props: Props) {
             });
         }
         // Just hide the excerpt dropdown if it is shown
-        if (editExcerptDropdownRef?.current) {
+        if (editExcerptDropdownRef.current) {
             editExcerptDropdownRef.current.setShowPopup(false);
         }
     }, [leadId, onEntryCreate]);
@@ -269,7 +269,7 @@ function LeftPane(props: Props) {
         onExcerptChange,
         onEntryDelete,
         onEntryRestore,
-        entryImage: entry?.image ? entryImagesMap?.[entry.image] : undefined,
+        entryImage: entry.image ? entryImagesMap?.[entry.image] : undefined,
         onApproveButtonClick,
         onDiscardButtonClick,
         disableClick: isEntrySelectionActive,
@@ -314,8 +314,8 @@ function LeftPane(props: Props) {
             return;
         }
         const { current: viewerContainer } = containerRef;
-        if (!fullScreenMode && isDefined(viewerContainer?.requestFullscreen)) {
-            viewerContainer?.requestFullscreen();
+        if (!fullScreenMode && isDefined(viewerContainer.requestFullscreen)) {
+            viewerContainer.requestFullscreen();
         } else if (fullScreenMode && isDefined(document.exitFullscreen)) {
             document.exitFullscreen();
         }
@@ -338,7 +338,7 @@ function LeftPane(props: Props) {
             heading={(lead?.url || lead?.attachment?.file) && (
                 <TextInput
                     name="url"
-                    value={lead?.url || lead?.attachment?.file?.url || ''}
+                    value={lead.url || lead.attachment?.file?.url || ''}
                     variant="general"
                     readOnly
                 />
@@ -418,7 +418,7 @@ function LeftPane(props: Props) {
                 <EntryItem
                     {...activeEntryDetails}
                     entryId={activeEntry}
-                    entryServerId={activeEntryDetails?.id}
+                    entryServerId={activeEntryDetails.id}
                     projectId={projectId}
                     isActive
                     onExcerptChange={onExcerptChange}
@@ -493,7 +493,7 @@ function LeftPane(props: Props) {
                         activeClassName={styles.simplifiedTab}
                         retainMount="lazy"
                     >
-                        {(leadPreview?.textExtract?.length ?? 0) > 0 ? (
+                        {(leadPreview?.textExtract.length ?? 0) > 0 ? (
                             <SimplifiedTextView
                                 className={styles.simplifiedTextView}
                                 activeEntryClientId={activeEntry}
diff --git a/app/views/Project/EntryEdit/index.tsx b/app/views/Project/EntryEdit/index.tsx
index 73810dd4b1..0a875af207 100644
--- a/app/views/Project/EntryEdit/index.tsx
+++ b/app/views/Project/EntryEdit/index.tsx
@@ -137,7 +137,7 @@ function EntryEdit(props: Props) {
     const alert = useAlert();
     const location = useLocation();
 
-    const locationState = location?.state as {
+    const locationState = location.state as {
         entryId?: string;
         sectionId?: string;
     } | undefined;
@@ -216,7 +216,7 @@ function EntryEdit(props: Props) {
             skip: isNotDefined(frameworkVariables),
             variables: frameworkVariables,
             onCompleted: (response) => {
-                const projectFromResponse = response?.project;
+                const projectFromResponse = response.project;
                 if (!projectFromResponse) {
                     return;
                 }
@@ -281,8 +281,8 @@ function EntryEdit(props: Props) {
     } = useForm(schema, defaultFormValues);
 
     const entriesFormStale = useMemo(
-        () => (formValue?.entries?.some((entry) => entry.stale) ?? false),
-        [formValue?.entries],
+        () => (formValue.entries?.some((entry) => entry.stale) ?? false),
+        [formValue.entries],
     );
 
     const formPristine = !entriesFormStale && leadPristine;
@@ -298,7 +298,7 @@ function EntryEdit(props: Props) {
         UPDATE_LEAD,
         {
             onCompleted: (response) => {
-                if (!response?.project?.leadUpdate) {
+                if (!response.project?.leadUpdate) {
                     return;
                 }
                 const {
@@ -321,11 +321,11 @@ function EntryEdit(props: Props) {
                 const leadData = removeNull(result);
                 setLeadValue({
                     ...leadData,
-                    attachment: leadData?.attachment?.id,
-                    leadGroup: leadData?.leadGroup?.id,
-                    assignee: leadData?.assignee?.id,
-                    source: leadData?.source?.id,
-                    authors: leadData?.authors?.map((author) => author.id),
+                    attachment: leadData.attachment?.id,
+                    leadGroup: leadData.leadGroup?.id,
+                    assignee: leadData.assignee?.id,
+                    source: leadData.source?.id,
+                    authors: leadData.authors?.map((author) => author.id),
                 });
             },
             onError: () => {
@@ -379,7 +379,7 @@ function EntryEdit(props: Props) {
                 if (!entryBulk) {
                     return;
                 }
-                const errors = entryBulk?.errors;
+                const { errors } = entryBulk;
                 const deletedResult = response.project?.entryBulk?.deletedResult;
                 const saveResult = response.project?.entryBulk?.result;
 
@@ -444,7 +444,7 @@ function EntryEdit(props: Props) {
                 }));
 
                 setFormValue((oldValue) => {
-                    const entries = oldValue?.entries ?? [];
+                    const entries = oldValue.entries ?? [];
                     const filteredEntries = entries.filter((item) => (
                         !deletedEntries.includes(item.clientId)
                     ));
@@ -469,15 +469,14 @@ function EntryEdit(props: Props) {
                     };
                 });
 
-                // eslint-disable-next-line max-len
-                const deleteErrorsCount = entryBulk?.deletedResult?.filter(isNotDefined).length ?? 0;
+                const deleteErrorsCount = entryBulk.deletedResult?.filter(isNotDefined).length ?? 0;
                 if (deleteErrorsCount > 0) {
                     alert.show(
                         `Failed to delete ${deleteErrorsCount} entries!`,
                         { variant: 'error' },
                     );
                 }
-                const deleteSuccessCount = entryBulk?.deletedResult?.filter(isDefined).length ?? 0;
+                const deleteSuccessCount = entryBulk.deletedResult?.filter(isDefined).length ?? 0;
                 if (deleteSuccessCount > 0) {
                     alert.show(
                         `Successfully deleted ${deleteSuccessCount} entry(s)!`,
@@ -485,14 +484,14 @@ function EntryEdit(props: Props) {
                     );
                 }
 
-                const saveErrorsCount = entryBulk?.result?.filter(isNotDefined).length ?? 0;
+                const saveErrorsCount = entryBulk.result?.filter(isNotDefined).length ?? 0;
                 if (saveErrorsCount > 0) {
                     alert.show(
                         `Failed to save ${saveErrorsCount} entry(s)!`,
                         { variant: 'error' },
                     );
                 }
-                const saveSuccessCount = entryBulk?.result?.filter(isDefined).length ?? 0;
+                const saveSuccessCount = entryBulk.result?.filter(isDefined).length ?? 0;
                 if (saveSuccessCount > 0) {
                     alert.show(
                         `Successfully saved ${saveSuccessCount} entry(s)!`,
@@ -569,8 +568,8 @@ function EntryEdit(props: Props) {
 
                     // NOTE: remembering the identifiers so that data and error
                     // can be patched later on
-                    const deleteIds = deletedEntries?.map((entry) => entry.clientId);
-                    const staleIds = staleEntries?.map((entry) => entry.clientId);
+                    const deleteIds = deletedEntries.map((entry) => entry.clientId);
+                    const staleIds = staleEntries.map((entry) => entry.clientId);
                     setStaleIdentifiers(staleIds);
                     setDeleteIdentifiers(deleteIds);
 
@@ -883,7 +882,7 @@ function EntryEdit(props: Props) {
             skip: isNotDefined(entriesVariables),
             variables: entriesVariables,
             onCompleted: (response) => {
-                const projectFromResponse = response?.project;
+                const projectFromResponse = response.project;
                 if (!projectFromResponse) {
                     return;
                 }
@@ -901,7 +900,7 @@ function EntryEdit(props: Props) {
                         ),
                     );
                     const geoData = leadFromResponse.entries
-                        ?.map((entry) => entry?.attributes)
+                        ?.map((entry) => entry.attributes)
                         .flat()
                         .map((attributes) => attributes?.geoSelectedOptions)
                         .flat()
@@ -1055,7 +1054,7 @@ function EntryEdit(props: Props) {
             ),
             leadId,
             disabled: !!selectedEntry,
-            entryImage: datum?.image ? entryImagesMap?.[datum.image] : undefined,
+            entryImage: datum.image ? entryImagesMap?.[datum.image] : undefined,
             error: entriesError?.[entryId],
             geoAreaOptions,
             onGeoAreaOptionsChange: setGeoAreaOptions,
diff --git a/app/views/Project/PillarAnalysis/AnalyticalStatementInput/AnalyticalNGramsModal/index.tsx b/app/views/Project/PillarAnalysis/AnalyticalStatementInput/AnalyticalNGramsModal/index.tsx
index 65c5c95920..9f298667bc 100644
--- a/app/views/Project/PillarAnalysis/AnalyticalStatementInput/AnalyticalNGramsModal/index.tsx
+++ b/app/views/Project/PillarAnalysis/AnalyticalStatementInput/AnalyticalNGramsModal/index.tsx
@@ -112,7 +112,7 @@ function AnalyticalNGramsModal(props: Props) {
 
     const entriesForNgrams = useMemo(() => (
         analyticalEntries?.map(
-            (ae) => (ae.entry ? entries?.[ae.entry] : undefined),
+            (ae) => (ae.entry ? entries[ae.entry] : undefined),
         ).filter(isDefined) ?? []
     ), [entries, analyticalEntries]);
 
diff --git a/app/views/Project/PillarAnalysis/AnalyticalStatementInput/index.tsx b/app/views/Project/PillarAnalysis/AnalyticalStatementInput/index.tsx
index b780fb3ef1..7d2bc20409 100644
--- a/app/views/Project/PillarAnalysis/AnalyticalStatementInput/index.tsx
+++ b/app/views/Project/PillarAnalysis/AnalyticalStatementInput/index.tsx
@@ -113,7 +113,7 @@ function AnalyticalStatementInput(props: AnalyticalStatementInputProps) {
                     // NOTE: Don't let users add more that certain items
                     if (
                         isNotDefined(movedItem)
-                        && (value?.analyticalEntries?.length ?? 0) >= ENTRIES_LIMIT
+                        && (value.analyticalEntries?.length ?? 0) >= ENTRIES_LIMIT
                     ) {
                         return oldEntries;
                     }
diff --git a/app/views/Project/PillarAnalysis/DiscardedEntries/DiscardedEntry/index.tsx b/app/views/Project/PillarAnalysis/DiscardedEntries/DiscardedEntry/index.tsx
index afb2864f31..343787b847 100644
--- a/app/views/Project/PillarAnalysis/DiscardedEntries/DiscardedEntry/index.tsx
+++ b/app/views/Project/PillarAnalysis/DiscardedEntries/DiscardedEntry/index.tsx
@@ -51,9 +51,7 @@ function DiscardedEntry(props: Props) {
         method: 'DELETE',
         failureMessage: 'Failed to undiscarded entry.',
         onSuccess: () => {
-            if (onEntryUndiscard) {
-                onEntryUndiscard();
-            }
+            onEntryUndiscard();
             alert.show(
                 'Successfully undiscarded the selected entry entry.',
                 { variant: 'success' },
diff --git a/app/views/Project/PillarAnalysis/DiscardedEntries/index.tsx b/app/views/Project/PillarAnalysis/DiscardedEntries/index.tsx
index b0b010b96f..d1654e06fd 100644
--- a/app/views/Project/PillarAnalysis/DiscardedEntries/index.tsx
+++ b/app/views/Project/PillarAnalysis/DiscardedEntries/index.tsx
@@ -100,7 +100,7 @@ function DiscardedEntries(props: Props) {
             discardedEntryId: data.id,
             tagDisplay: data.tagDisplay,
             excerpt: data.entryDetails.excerpt ?? '',
-            image: data.entryDetails?.imageDetails?.file ? ({
+            image: data.entryDetails.imageDetails?.file ? ({
                 id: String(data.entryDetails.imageDetails.id),
                 title: data.entryDetails.imageDetails.title ?? '',
                 file: {
diff --git a/app/views/Project/PillarAnalysis/SourceEntryItem/index.tsx b/app/views/Project/PillarAnalysis/SourceEntryItem/index.tsx
index 4763609b7f..7d135040ea 100644
--- a/app/views/Project/PillarAnalysis/SourceEntryItem/index.tsx
+++ b/app/views/Project/PillarAnalysis/SourceEntryItem/index.tsx
@@ -67,9 +67,7 @@ function SourceEntryItem(props: Props) {
         body: (ctx) => ctx,
         failureMessage: _ts('pillarAnalysis', 'pillarAnalysisTitle'),
         onSuccess: () => {
-            if (onEntryDiscard) {
-                onEntryDiscard();
-            }
+            onEntryDiscard();
         },
     });
 
diff --git a/app/views/Project/PillarAnalysis/index.tsx b/app/views/Project/PillarAnalysis/index.tsx
index 95aa955a7f..1cc6ba0ebd 100644
--- a/app/views/Project/PillarAnalysis/index.tsx
+++ b/app/views/Project/PillarAnalysis/index.tsx
@@ -444,7 +444,7 @@ function PillarAnalysis() {
 
                 const entryIdsInState = pillarAnalysisFromState?.analyticalStatements
                     ?.map((statement) => (
-                        statement.analyticalEntries?.map((entry) => entry.entry)
+                        statement.analyticalEntries.map((entry) => entry.entry)
                     )).flat().filter(isDefined).flat();
 
                 const allEntryIds = unique(
@@ -535,7 +535,7 @@ function PillarAnalysis() {
 
     const handleEntryDrop = useCallback(
         (entryId: string) => {
-            const entry = entriesResponse?.results?.find((item) => item.id === entryId);
+            const entry = entriesResponse.results?.find((item) => item.id === entryId);
             if (!entry) {
                 // eslint-disable-next-line no-console
                 console.error('Me no understand how this entry came from', entryId);
@@ -546,7 +546,7 @@ function PillarAnalysis() {
                 [entryId]: entry,
             }));
         },
-        [entriesResponse?.results],
+        [entriesResponse.results],
     );
 
     const handleAnalyticalStatementAdd = useCallback(
@@ -656,7 +656,7 @@ function PillarAnalysis() {
         onEntryMove: handleEntryMove,
         onEntryDrop: handleEntryDrop,
         onSelectedNgramChange: handleNgramChange,
-        error: arrayError?.[statement?.clientId],
+        error: arrayError?.[statement.clientId],
     }), [
         handleNgramChange,
         onAnalyticalStatementChange,
@@ -778,7 +778,7 @@ function PillarAnalysis() {
                                         {_ts(
                                             'pillarAnalysis',
                                             'entriesTabLabel',
-                                            { entriesCount: entriesResponse?.totalCount },
+                                            { entriesCount: entriesResponse.totalCount },
                                         )}
                                     </Tab>
                                     <Tab name="discarded">
@@ -793,7 +793,7 @@ function PillarAnalysis() {
                             >
                                 <ListView
                                     className={styles.entriesList}
-                                    data={entriesResponse?.results}
+                                    data={entriesResponse.results}
                                     keySelector={entryKeySelector}
                                     renderer={SourceEntryItem}
                                     rendererParams={entryCardRendererParams}
@@ -813,7 +813,7 @@ function PillarAnalysis() {
                                 <Pager
                                     className={styles.pager}
                                     activePage={activePage}
-                                    itemsCount={entriesResponse?.totalCount ?? 0}
+                                    itemsCount={entriesResponse.totalCount ?? 0}
                                     maxItemsPerPage={maxItemsPerPage}
                                     onActivePageChange={setActivePage}
                                     itemsPerPageControlHidden
diff --git a/app/views/Project/Tagging/Assessments/ActionCell/index.tsx b/app/views/Project/Tagging/Assessments/ActionCell/index.tsx
index b02b90a93d..fb4710ad09 100644
--- a/app/views/Project/Tagging/Assessments/ActionCell/index.tsx
+++ b/app/views/Project/Tagging/Assessments/ActionCell/index.tsx
@@ -59,7 +59,7 @@ function ActionCell(props: Props) {
         ASSESSMENT_DELETE,
         {
             onCompleted: (result) => {
-                if (result?.project?.assessmentDelete?.ok) {
+                if (result.project?.assessmentDelete?.ok) {
                     onDeleteSuccess();
                     alert.show(
                         'Successfully deleted assessment.',
diff --git a/app/views/Project/Tagging/Assessments/AssessmentFilterForm/index.tsx b/app/views/Project/Tagging/Assessments/AssessmentFilterForm/index.tsx
index 7b6dfdab34..d0575ef359 100644
--- a/app/views/Project/Tagging/Assessments/AssessmentFilterForm/index.tsx
+++ b/app/views/Project/Tagging/Assessments/AssessmentFilterForm/index.tsx
@@ -73,7 +73,7 @@ function AssessmentFilterForm(props: Props) {
                 <TextInput
                     name="search"
                     label="Search"
-                    value={value?.search}
+                    value={value.search}
                     onChange={setFieldValue}
                     placeholder="any"
                 />
@@ -83,8 +83,8 @@ function AssessmentFilterForm(props: Props) {
                     toName="endDate"
                     fromOnChange={setFieldValue}
                     toOnChange={setFieldValue}
-                    fromValue={value?.startDate}
-                    toValue={value?.endDate}
+                    fromValue={value.startDate}
+                    toValue={value.endDate}
                 />
             </div>
             <div className={styles.buttonContainer}>
diff --git a/app/views/Project/Tagging/Assessments/index.tsx b/app/views/Project/Tagging/Assessments/index.tsx
index 288150c399..c4f9cf7def 100644
--- a/app/views/Project/Tagging/Assessments/index.tsx
+++ b/app/views/Project/Tagging/Assessments/index.tsx
@@ -142,22 +142,22 @@ function Assessments(props: Props) {
             createStringColumn<Assessment, string>(
                 'title',
                 'Title',
-                (item) => item?.lead?.title ?? item?.leadGroup?.title,
+                (item) => item.lead?.title ?? item.leadGroup?.title,
             ),
             createStringColumn<Assessment, string>(
                 'type',
                 'Type',
-                (item) => (item?.lead?.id ? 'Source' : 'Source Group'),
+                (item) => (item.lead?.id ? 'Source' : 'Source Group'),
             ),
             createStringColumn<Assessment, string>(
                 'created_by',
                 'Created By',
-                (item) => item?.createdBy?.displayName,
+                (item) => item.createdBy?.displayName,
             ),
             createDateColumn<Assessment, string>(
                 'created_at',
                 'Created At',
-                (item) => item?.createdAt,
+                (item) => item.createdAt,
                 {
                     columnWidth: 116,
                 },
diff --git a/app/views/Project/Tagging/Dashboard/VisualizationShareModal/index.tsx b/app/views/Project/Tagging/Dashboard/VisualizationShareModal/index.tsx
index 9a1068204e..2dfc69d03d 100644
--- a/app/views/Project/Tagging/Dashboard/VisualizationShareModal/index.tsx
+++ b/app/views/Project/Tagging/Dashboard/VisualizationShareModal/index.tsx
@@ -74,16 +74,16 @@ function VisualizationShareModal(props: ShareModalProps) {
         UPDATE_PROJECT_VIZ_PUBLIC_SHARE,
         {
             onCompleted: (response) => {
-                const update = removeNull(response?.project?.projectVizConfigurationUpdate);
-                if (update?.ok) {
+                const update = removeNull(response.project?.projectVizConfigurationUpdate);
+                if (update.ok) {
                     alert.show(
                         'Successfully changed url status.',
                         {
                             variant: 'success',
                         },
                     );
-                    onPublicShareEnabledChange(!!update?.result?.publicShare);
-                    onPublicUrlChange(update?.result?.publicUrl);
+                    onPublicShareEnabledChange(!!update.result?.publicShare);
+                    onPublicUrlChange(update.result?.publicUrl);
                 } else {
                     alert.show(
                         'Failed to change url status.',
diff --git a/app/views/Project/Tagging/Dashboard/index.tsx b/app/views/Project/Tagging/Dashboard/index.tsx
index 1ab75e4bce..69d2f631f1 100644
--- a/app/views/Project/Tagging/Dashboard/index.tsx
+++ b/app/views/Project/Tagging/Dashboard/index.tsx
@@ -75,8 +75,8 @@ function Dashboard(props: Props) {
             variables,
             onCompleted: (result) => {
                 const cleanResult = removeNull(result);
-                setPublicUrl(cleanResult?.project?.vizData?.publicUrl);
-                setPublicShareEnabled(cleanResult?.project?.vizData?.publicShare);
+                setPublicUrl(cleanResult.project?.vizData?.publicUrl);
+                setPublicShareEnabled(cleanResult.project?.vizData?.publicShare);
             },
         },
     );
@@ -150,7 +150,7 @@ function Dashboard(props: Props) {
                     onPublicShareEnabledChange={setPublicShareEnabled}
                     onPublicUrlChange={setPublicUrl}
                     onClose={hideShareModal}
-                    isAdmin={!!project?.allowedPermissions.includes('UPDATE_PROJECT')}
+                    isAdmin={!!project.allowedPermissions.includes('UPDATE_PROJECT')}
                 />
             )}
         </Container>
diff --git a/app/views/Project/Tagging/Export/AssessmentsExportSelection/index.tsx b/app/views/Project/Tagging/Export/AssessmentsExportSelection/index.tsx
index 66e8e516e8..d24ffe2a3b 100644
--- a/app/views/Project/Tagging/Export/AssessmentsExportSelection/index.tsx
+++ b/app/views/Project/Tagging/Export/AssessmentsExportSelection/index.tsx
@@ -58,7 +58,7 @@ function AssessmentsExportSelection(props: Props) {
     const alert = useAlert();
 
     const { project } = React.useContext(ProjectContext);
-    const filterOnlyUnprotected = !!project?.allowedPermissions?.includes('VIEW_ONLY_UNPROTECTED_LEAD');
+    const filterOnlyUnprotected = !!project?.allowedPermissions.includes('VIEW_ONLY_UNPROTECTED_LEAD');
 
     const [queryTitle, setQueryTitle] = useState<string | undefined>();
     const [previewId, setPreviewId] = useState<string | undefined>(undefined);
@@ -78,9 +78,9 @@ function AssessmentsExportSelection(props: Props) {
                 'ProjectExports',
             ],
             onCompleted: (response) => {
-                if (response?.project?.exportCreate?.ok) {
+                if (response.project?.exportCreate?.ok) {
                     if (response.project.exportCreate.result?.isPreview) {
-                        setPreviewId(response.project.exportCreate.result?.id);
+                        setPreviewId(response.project.exportCreate.result.id);
                     } else {
                         alert.show(
                             _ts('export', 'exportStartedNotifyMessage'),
diff --git a/app/views/Project/Tagging/Export/EntriesExportSelection/index.tsx b/app/views/Project/Tagging/Export/EntriesExportSelection/index.tsx
index b9f629fdb4..d88032b5c5 100644
--- a/app/views/Project/Tagging/Export/EntriesExportSelection/index.tsx
+++ b/app/views/Project/Tagging/Export/EntriesExportSelection/index.tsx
@@ -191,7 +191,7 @@ function EntriesExportSelection(props: Props) {
     const alert = useAlert();
 
     const { project } = React.useContext(ProjectContext);
-    const filterOnlyUnprotected = !!project?.allowedPermissions?.includes('VIEW_ONLY_UNPROTECTED_LEAD');
+    const filterOnlyUnprotected = !!project?.allowedPermissions.includes('VIEW_ONLY_UNPROTECTED_LEAD');
 
     const [queryTitle, setQueryTitle] = useState<string | undefined>();
     const [previewId, setPreviewId] = useState<string | undefined>(undefined);
@@ -238,7 +238,7 @@ function EntriesExportSelection(props: Props) {
             onCompleted: (response) => {
                 // TODO handle for conditional widgets
                 const widgets = getWidgets(
-                    response.project?.analysisFramework as AnalysisFramework,
+                    response.project?.analysisFramework as (AnalysisFramework | undefined),
                 );
                 const textWidgetList = widgets
                     ?.filter((v) => v.widgetId === 'TEXT')
@@ -265,9 +265,9 @@ function EntriesExportSelection(props: Props) {
                 'ProjectExports',
             ],
             onCompleted: (response) => {
-                if (response?.project?.exportCreate?.ok) {
+                if (response.project?.exportCreate?.ok) {
                     if (response.project.exportCreate.result?.isPreview) {
-                        setPreviewId(response.project.exportCreate.result?.id);
+                        setPreviewId(response.project.exportCreate.result.id);
                     } else {
                         alert.show(
                             _ts('export', 'exportStartedNotifyMessage'),
@@ -288,7 +288,10 @@ function EntriesExportSelection(props: Props) {
         },
     );
 
-    const analysisFramework = frameworkResponse?.project?.analysisFramework as AnalysisFramework;
+    const analysisFramework = frameworkResponse?.project?.analysisFramework as (
+        AnalysisFramework | undefined
+    );
+
     useEffect(() => {
         const structure = createReportStructure(
             reportStructureVariant,
diff --git a/app/views/Project/Tagging/Export/ExportHistory/index.tsx b/app/views/Project/Tagging/Export/ExportHistory/index.tsx
index f59dfc9e30..edb86ee848 100644
--- a/app/views/Project/Tagging/Export/ExportHistory/index.tsx
+++ b/app/views/Project/Tagging/Export/ExportHistory/index.tsx
@@ -263,7 +263,7 @@ function ExportHistory(props: Props) {
         DELETE_EXPORT,
         {
             onCompleted: (response) => {
-                if (response?.project?.exportDelete?.ok) {
+                if (response.project?.exportDelete?.ok) {
                     alert.show(
                         _ts('export', 'deleteExportSuccess'),
                         { variant: 'success' },
diff --git a/app/views/Project/Tagging/Export/ExportPreview/index.tsx b/app/views/Project/Tagging/Export/ExportPreview/index.tsx
index e064431946..0fd0d5dbf5 100644
--- a/app/views/Project/Tagging/Export/ExportPreview/index.tsx
+++ b/app/views/Project/Tagging/Export/ExportPreview/index.tsx
@@ -81,7 +81,7 @@ function ExportPreview(props: OwnProps) {
             {!pending && isDefined(exportResponse) ? (
                 <LeadPreview
                     className={styles.leadPreview}
-                    url={exportResponse?.file}
+                    url={exportResponse.file}
                 />
             ) : (!pending && (
                 <div className={styles.label}>
diff --git a/app/views/Project/Tagging/Export/LeadsSelection/index.tsx b/app/views/Project/Tagging/Export/LeadsSelection/index.tsx
index eec8e2abc0..22e2f44820 100644
--- a/app/views/Project/Tagging/Export/LeadsSelection/index.tsx
+++ b/app/views/Project/Tagging/Export/LeadsSelection/index.tsx
@@ -276,7 +276,7 @@ function LeadsSelection(props: Props) {
             createStringColumn<Lead, string>(
                 'title',
                 'Title',
-                (item) => item?.title,
+                (item) => item.title,
                 {
                     sortable: true,
                     columnClassName: styles.titleColumn,
@@ -294,7 +294,7 @@ function LeadsSelection(props: Props) {
             createStringColumn<Lead, string>(
                 'authors',
                 'Authors',
-                (item) => item?.authors?.map((v) => organizationTitleSelector(v)).filter(isDefined).join(','),
+                (item) => item.authors?.map((v) => organizationTitleSelector(v)).filter(isDefined).join(','),
                 {
                     sortable: false,
                     columnWidth: 144,
@@ -304,7 +304,7 @@ function LeadsSelection(props: Props) {
             createNumberColumn<Lead, string>(
                 'entriesCounts',
                 'No of entries',
-                (item) => item?.entriesCounts?.total,
+                (item) => item.entriesCounts?.total,
                 {
                     sortable: true,
                 },
diff --git a/app/views/Project/Tagging/Export/utils.ts b/app/views/Project/Tagging/Export/utils.ts
index 07616d3133..5062dd04ce 100644
--- a/app/views/Project/Tagging/Export/utils.ts
+++ b/app/views/Project/Tagging/Export/utils.ts
@@ -164,7 +164,7 @@ export const createReportStructure = (
             }
             const { properties } = widget;
 
-            let newLevels = exportable?.data?.report?.levels;
+            let newLevels = exportable.data?.report?.levels;
             if (reportStructureVariant === DIMENSION_FIRST) {
                 newLevels = transformLevelsRowFirst(properties, includeSubColumn);
             } else if (includeSubColumn) {
@@ -188,7 +188,7 @@ export const createReportStructure = (
             if (!widget || widget.widgetId !== exportable.widgetType) {
                 return undefined;
             }
-            const newLevels = exportable?.data?.report?.levels;
+            const newLevels = exportable.data?.report.levels;
             if (!newLevels) {
                 return undefined;
             }
diff --git a/app/views/Project/Tagging/LeadGroups/ActionCell/index.tsx b/app/views/Project/Tagging/LeadGroups/ActionCell/index.tsx
index 9f6c858e59..362f240d22 100644
--- a/app/views/Project/Tagging/LeadGroups/ActionCell/index.tsx
+++ b/app/views/Project/Tagging/LeadGroups/ActionCell/index.tsx
@@ -58,7 +58,7 @@ function ActionCell(props: Props) {
         LEAD_GROUP_DELETE,
         {
             onCompleted: (result) => {
-                if (result?.project?.leadGroupDelete?.ok) {
+                if (result.project?.leadGroupDelete?.ok) {
                     onDeleteSuccess();
                     alert.show(
                         'Successfully deleted source group.',
diff --git a/app/views/Project/Tagging/LeadGroups/LeadGroupFilterForm/index.tsx b/app/views/Project/Tagging/LeadGroups/LeadGroupFilterForm/index.tsx
index a09afafed8..cf7fb8dabb 100644
--- a/app/views/Project/Tagging/LeadGroups/LeadGroupFilterForm/index.tsx
+++ b/app/views/Project/Tagging/LeadGroups/LeadGroupFilterForm/index.tsx
@@ -73,7 +73,7 @@ function LeadGroupFilterForm(props: Props) {
                 <TextInput
                     name="search"
                     label="Search"
-                    value={value?.search}
+                    value={value.search}
                     onChange={setFieldValue}
                     placeholder="any"
                 />
@@ -83,8 +83,8 @@ function LeadGroupFilterForm(props: Props) {
                     toName="endDate"
                     fromOnChange={setFieldValue}
                     toOnChange={setFieldValue}
-                    fromValue={value?.startDate}
-                    toValue={value?.endDate}
+                    fromValue={value.startDate}
+                    toValue={value.endDate}
                 />
             </div>
             <div className={styles.buttonContainer}>
diff --git a/app/views/Project/Tagging/LeadGroups/index.tsx b/app/views/Project/Tagging/LeadGroups/index.tsx
index 562322ab0f..e907347c67 100644
--- a/app/views/Project/Tagging/LeadGroups/index.tsx
+++ b/app/views/Project/Tagging/LeadGroups/index.tsx
@@ -149,22 +149,22 @@ function LeadGroups(props: Props) {
             createStringColumn<LeadGroup, string>(
                 'title',
                 'Title',
-                (item) => item?.title,
+                (item) => item.title,
             ),
             createStringColumn<LeadGroup, string>(
                 'created_by',
                 'Created By',
-                (item) => item?.createdBy?.displayName,
+                (item) => item.createdBy?.displayName,
             ),
             createNumberColumn<LeadGroup, string>(
                 'leadCounts',
                 'No. of Sources',
-                (item) => item?.leadCounts,
+                (item) => item.leadCounts,
             ),
             createDateColumn<LeadGroup, string>(
                 'created_at',
                 'Created At',
-                (item) => item?.createdAt,
+                (item) => item.createdAt,
                 {
                     columnWidth: 116,
                 },
diff --git a/app/views/Project/Tagging/Sources/BulkUpload/Upload/DropboxFilesUpload/DropboxPicker/index.tsx b/app/views/Project/Tagging/Sources/BulkUpload/Upload/DropboxFilesUpload/DropboxPicker/index.tsx
index 7b376958b1..bfc137a98a 100644
--- a/app/views/Project/Tagging/Sources/BulkUpload/Upload/DropboxFilesUpload/DropboxPicker/index.tsx
+++ b/app/views/Project/Tagging/Sources/BulkUpload/Upload/DropboxFilesUpload/DropboxPicker/index.tsx
@@ -61,7 +61,7 @@ function DropboxPicker(props: Props) {
     }, [onSuccess]);
 
     const handleClick = useCallback(() => {
-        window?.Dropbox?.choose({
+        window.Dropbox?.choose({
             success: handleSuccess,
             cancel: handleCancel,
             linkType,
diff --git a/app/views/Project/Tagging/Sources/BulkUpload/index.tsx b/app/views/Project/Tagging/Sources/BulkUpload/index.tsx
index 284a95f2f8..d033a199a4 100644
--- a/app/views/Project/Tagging/Sources/BulkUpload/index.tsx
+++ b/app/views/Project/Tagging/Sources/BulkUpload/index.tsx
@@ -119,7 +119,7 @@ function BulkUpload(props: Props) {
                 } = leadBulk;
 
                 if (errors) {
-                    const leadsErrors = errors?.map((item, index) => {
+                    const leadsErrors = errors.map((item, index) => {
                         if (isNotDefined(item)) {
                             return undefined;
                         }
@@ -132,7 +132,7 @@ function BulkUpload(props: Props) {
                             clientId,
                             error: transformToFormError(removeNull(item) as ObjectError[]),
                         };
-                    }).filter(isDefined) ?? [];
+                    }).filter(isDefined);
                     const leadsErrorMapping = listToMap(
                         leadsErrors,
                         (item) => item.clientId,
@@ -172,7 +172,7 @@ function BulkUpload(props: Props) {
                         ), 'leads');
                     }
 
-                    const erroredLeadsCount = (result?.length ?? 0) - uploadedLeads.length;
+                    const erroredLeadsCount = result.length - uploadedLeads.length;
 
                     if (erroredLeadsCount > 0) {
                         alert.show(
@@ -245,11 +245,11 @@ function BulkUpload(props: Props) {
         if (!selectedLead) {
             return undefined;
         }
-        const selectedLeadData = formValue?.leads?.find((lead) => lead.clientId === selectedLead);
+        const selectedLeadData = formValue.leads?.find((lead) => lead.clientId === selectedLead);
         if (!selectedLeadData) {
             return undefined;
         }
-        const selectedFile = uploadedFiles?.find(
+        const selectedFile = uploadedFiles.find(
             (file) => String(file.id) === selectedLeadData.attachment,
         );
         if (!selectedFile) {
@@ -272,7 +272,7 @@ function BulkUpload(props: Props) {
                 formValidate,
                 setFormError,
                 (value) => {
-                    setLeadClientIds(value?.leads?.map((lead) => lead.clientId));
+                    setLeadClientIds(value.leads?.map((lead) => lead.clientId));
                     const leads = (value.leads ?? []) as LeadInputType[];
 
                     if (leads.length > 0) {
@@ -303,7 +303,7 @@ function BulkUpload(props: Props) {
                     disabled={
                         formPristine
                         || bulkCreateLeadsPending
-                        || (formValue?.leads?.length ?? 0) < 1
+                        || (formValue.leads?.length ?? 0) < 1
                     }
                     onClick={handleSubmit}
                 >
diff --git a/app/views/Project/Tagging/Sources/EntriesGrid/EntryCard/index.tsx b/app/views/Project/Tagging/Sources/EntriesGrid/EntryCard/index.tsx
index e397857e20..e563454472 100644
--- a/app/views/Project/Tagging/Sources/EntriesGrid/EntryCard/index.tsx
+++ b/app/views/Project/Tagging/Sources/EntriesGrid/EntryCard/index.tsx
@@ -88,8 +88,8 @@ function EntryCard(props: Props) {
     const alert = useAlert();
     const { project } = useContext(ProjectContext);
     const authorsDetailText = useMemo(() => (
-        leadDetails?.authors?.map((a) => a.title)?.join(', ')
-    ), [leadDetails?.authors]);
+        leadDetails.authors?.map((a) => a.title)?.join(', ')
+    ), [leadDetails.authors]);
 
     const [
         deleteEntry,
diff --git a/app/views/Project/Tagging/Sources/EntriesGrid/index.tsx b/app/views/Project/Tagging/Sources/EntriesGrid/index.tsx
index e30ac7ba67..dc8330b3a2 100644
--- a/app/views/Project/Tagging/Sources/EntriesGrid/index.tsx
+++ b/app/views/Project/Tagging/Sources/EntriesGrid/index.tsx
@@ -266,7 +266,7 @@ function EntriesGrid(props: Props) {
             skip: isNotDefined(variables),
             variables,
             onCompleted: (response) => {
-                const projectFromResponse = response?.project;
+                const projectFromResponse = response.project;
                 if (!projectFromResponse) {
                     return;
                 }
@@ -278,7 +278,7 @@ function EntriesGrid(props: Props) {
                     ),
                 );
                 const geoData = projectFromResponse.entries?.results
-                    ?.map((entry) => entry?.attributes)
+                    ?.map((entry) => entry.attributes)
                     .flat()
                     .map((attributes) => attributes?.geoSelectedOptions)
                     .flat()
diff --git a/app/views/Project/Tagging/Sources/LeadEditModal/index.tsx b/app/views/Project/Tagging/Sources/LeadEditModal/index.tsx
index 721e8b021c..66d99095f9 100644
--- a/app/views/Project/Tagging/Sources/LeadEditModal/index.tsx
+++ b/app/views/Project/Tagging/Sources/LeadEditModal/index.tsx
@@ -301,15 +301,15 @@ function LeadEditModal(props: Props) {
             skip: !variables,
             variables,
             onCompleted: (response) => {
-                const leadData = removeNull(response?.project?.lead);
+                const leadData = removeNull(response.project?.lead);
                 if (leadData) {
                     setValue({
                         ...leadData,
-                        attachment: leadData?.attachment?.id,
-                        leadGroup: leadData?.leadGroup?.id,
-                        assignee: leadData?.assignee?.id,
-                        source: leadData?.source?.id,
-                        authors: leadData?.authors?.map((author) => author.id),
+                        attachment: leadData.attachment?.id,
+                        leadGroup: leadData.leadGroup?.id,
+                        assignee: leadData.assignee?.id,
+                        source: leadData.source?.id,
+                        authors: leadData.authors?.map((author) => author.id),
                     });
                     const {
                         leadGroup,
@@ -353,7 +353,7 @@ function LeadEditModal(props: Props) {
         {
             refetchQueries: ['ProjectSources'],
             onCompleted: (response) => {
-                if (!response?.project?.leadUpdate) {
+                if (!response.project?.leadUpdate) {
                     return;
                 }
                 const {
@@ -393,7 +393,7 @@ function LeadEditModal(props: Props) {
         {
             refetchQueries: ['ProjectSources'],
             onCompleted: (response) => {
-                if (!response?.project?.leadCreate) {
+                if (!response.project?.leadCreate) {
                     return;
                 }
                 const {
@@ -479,7 +479,7 @@ function LeadEditModal(props: Props) {
             <Card className={styles.previewContainer}>
                 <LeadPreview
                     className={styles.preview}
-                    url={value?.url ?? undefined}
+                    url={value.url ?? undefined}
                     attachment={leadData?.attachment ?? undefined}
                 />
             </Card>
diff --git a/app/views/Project/Tagging/Sources/SourcesFilter/EntryFilter/FrameworkFilterItem/index.tsx b/app/views/Project/Tagging/Sources/SourcesFilter/EntryFilter/FrameworkFilterItem/index.tsx
index 10c06b9e66..50abd96e11 100644
--- a/app/views/Project/Tagging/Sources/SourcesFilter/EntryFilter/FrameworkFilterItem/index.tsx
+++ b/app/views/Project/Tagging/Sources/SourcesFilter/EntryFilter/FrameworkFilterItem/index.tsx
@@ -136,9 +136,9 @@ function FrameworkFilterItem<K extends number>(props: Props<K>) {
                     )}
                     name={name}
                     onChange={handleDateRangeChange}
-                    value={value?.valueGte && value?.valueLte ? {
-                        startDate: encodeDate(new Date(value?.valueGte)),
-                        endDate: encodeDate(new Date(value?.valueLte)),
+                    value={value?.valueGte && value.valueLte ? {
+                        startDate: encodeDate(new Date(value.valueGte)),
+                        endDate: encodeDate(new Date(value.valueLte)),
                     } : undefined}
                     label={title}
                     disabled={disabled}
@@ -163,9 +163,9 @@ function FrameworkFilterItem<K extends number>(props: Props<K>) {
                     )}
                     name={name}
                     onChange={handleDateRangeChange}
-                    value={value?.valueGte && value?.valueLte ? {
-                        startDate: encodeDate(new Date(value?.valueGte)),
-                        endDate: encodeDate(new Date(value?.valueLte)),
+                    value={value?.valueGte && value.valueLte ? {
+                        startDate: encodeDate(new Date(value.valueGte)),
+                        endDate: encodeDate(new Date(value.valueLte)),
                     } : undefined}
                     label={title}
                     disabled={disabled}
@@ -185,9 +185,9 @@ function FrameworkFilterItem<K extends number>(props: Props<K>) {
                     )}
                     name={name}
                     onChange={handleTimeRangeChange}
-                    value={value?.valueGte && value?.valueLte ? {
-                        startTime: value?.valueGte,
-                        endTime: value?.valueLte,
+                    value={value?.valueGte && value.valueLte ? {
+                        startTime: value.valueGte,
+                        endTime: value.valueLte,
                     } : undefined}
                     label={title}
                     disabled={disabled}
@@ -207,9 +207,9 @@ function FrameworkFilterItem<K extends number>(props: Props<K>) {
                     )}
                     name={name}
                     onChange={handleTimeRangeChange}
-                    value={value?.valueGte && value?.valueLte ? {
-                        startTime: value?.valueGte,
-                        endTime: value?.valueLte,
+                    value={value?.valueGte && value.valueLte ? {
+                        startTime: value.valueGte,
+                        endTime: value.valueLte,
                     } : undefined}
                     label={title}
                     disabled={disabled}
diff --git a/app/views/Project/Tagging/Sources/SourcesFilter/EntryFilter/index.tsx b/app/views/Project/Tagging/Sources/SourcesFilter/EntryFilter/index.tsx
index 5210f921d6..cc56059fa3 100644
--- a/app/views/Project/Tagging/Sources/SourcesFilter/EntryFilter/index.tsx
+++ b/app/views/Project/Tagging/Sources/SourcesFilter/EntryFilter/index.tsx
@@ -154,9 +154,9 @@ function EntryFilter<K extends string>(props: Props<K>) {
                     return (
                         <FrameworkFilterItem
                             key={filter.id}
-                            name={filterValue?.index}
+                            name={filterValue.index}
                             title={filter.title}
-                            value={filterValue?.value}
+                            value={filterValue.value}
                             filter={filter}
                             projectId={projectId}
                             onChange={onFrameworkFilterChange}
diff --git a/app/views/Project/Tagging/Sources/SourcesFilter/index.tsx b/app/views/Project/Tagging/Sources/SourcesFilter/index.tsx
index bdf8ee9e19..314bea7b31 100644
--- a/app/views/Project/Tagging/Sources/SourcesFilter/index.tsx
+++ b/app/views/Project/Tagging/Sources/SourcesFilter/index.tsx
@@ -207,9 +207,7 @@ function SourcesFilter(props: Props) {
     } = useForm(schema, initialValue);
 
     useEffect(() => {
-        if (valueFromProps) {
-            setValue(valueFromProps);
-        }
+        setValue(valueFromProps);
     }, [valueFromProps, setValue]);
 
     const {
diff --git a/app/views/Project/Tagging/Sources/SourcesTable/BulkActions/index.tsx b/app/views/Project/Tagging/Sources/SourcesTable/BulkActions/index.tsx
index 6ff8113c67..42a78e5f4b 100644
--- a/app/views/Project/Tagging/Sources/SourcesTable/BulkActions/index.tsx
+++ b/app/views/Project/Tagging/Sources/SourcesTable/BulkActions/index.tsx
@@ -50,9 +50,7 @@ function BulkActions(props: Props) {
     ), [selectedLeads]);
 
     const onRemoveBulkLead = useCallback(() => {
-        if (onRemoveClick) {
-            onRemoveClick(selectedLeads.map((lead) => lead.id));
-        }
+        onRemoveClick(selectedLeads.map((lead) => lead.id));
     }, [onRemoveClick, selectedLeads]);
 
     const selectedLeadsIds = useMemo(() => (
diff --git a/app/views/Project/Tagging/Sources/SourcesTable/EntryList/index.tsx b/app/views/Project/Tagging/Sources/SourcesTable/EntryList/index.tsx
index d6fc0acf01..346fed84b9 100644
--- a/app/views/Project/Tagging/Sources/SourcesTable/EntryList/index.tsx
+++ b/app/views/Project/Tagging/Sources/SourcesTable/EntryList/index.tsx
@@ -205,7 +205,7 @@ export const PROJECT_FRAMEWORK = gql`
 `;
 
 const maxItemsPerPage = 5;
-const entryKeySelector = (e: Entry) => e.clientId ?? e.id;
+const entryKeySelector = (e: Entry) => e.clientId;
 
 interface Props {
     className?: string;
@@ -273,7 +273,7 @@ function EntryList(props: Props) {
             skip: isNotDefined(variables),
             variables,
             onCompleted: (response) => {
-                const projectFromResponse = response?.project;
+                const projectFromResponse = response.project;
                 if (!projectFromResponse) {
                     return;
                 }
@@ -285,7 +285,7 @@ function EntryList(props: Props) {
                     ),
                 );
                 const geoData = projectFromResponse.entries?.results
-                    ?.map((entry) => entry?.attributes)
+                    ?.map((entry) => entry.attributes)
                     .flat()
                     .map((attributes) => attributes?.geoSelectedOptions)
                     .flat()
diff --git a/app/views/Project/Tagging/Sources/SourcesTable/LeadCopyModal/index.tsx b/app/views/Project/Tagging/Sources/SourcesTable/LeadCopyModal/index.tsx
index 58b2ed3685..5db7d2675a 100644
--- a/app/views/Project/Tagging/Sources/SourcesTable/LeadCopyModal/index.tsx
+++ b/app/views/Project/Tagging/Sources/SourcesTable/LeadCopyModal/index.tsx
@@ -61,7 +61,7 @@ function LeadCopyModal(props: Props) {
         LEAD_COPY,
         {
             onCompleted: (response) => {
-                if (!response?.project?.leadCopy) {
+                if (!response.project?.leadCopy) {
                     return;
                 }
                 const {
@@ -119,8 +119,8 @@ function LeadCopyModal(props: Props) {
                     onConfirm={handleCopyLeadsClick}
                     message={`
                         Are you sure you want to copy
-                        ${leadIds?.length.toString()} source(s) to
-                        ${selectedProjects?.length.toString()} project(s)?
+                        ${leadIds.length.toString()} source(s) to
+                        ${selectedProjects.length.toString()} project(s)?
                     `}
                 >
                     Export
@@ -130,7 +130,7 @@ function LeadCopyModal(props: Props) {
             {loading && <PendingMessage />}
             <TextOutput
                 label="No. of sources to be copied"
-                value={leadIds?.length ?? 0}
+                value={leadIds.length}
             />
             <ProjectMultiSelectInput
                 name="searchProjects"
diff --git a/app/views/Project/Tagging/Sources/SourcesTable/index.tsx b/app/views/Project/Tagging/Sources/SourcesTable/index.tsx
index 0a95ae8b17..9f6a3e2231 100644
--- a/app/views/Project/Tagging/Sources/SourcesTable/index.tsx
+++ b/app/views/Project/Tagging/Sources/SourcesTable/index.tsx
@@ -302,7 +302,7 @@ function SourcesTable(props: Props) {
         DELETE_LEAD,
         {
             onCompleted: (response) => {
-                if (response?.project?.leadDelete?.ok) {
+                if (response.project?.leadDelete?.ok) {
                     alert.show(
                         'Successfully deleted lead.',
                         {
@@ -365,7 +365,7 @@ function SourcesTable(props: Props) {
         setExpandedRowKey,
     ] = useRowExpansion<Lead, string>(
         ({ datum }) => {
-            if ((datum?.entriesCounts?.total ?? 0) > 0) {
+            if ((datum.entriesCounts?.total ?? 0) > 0) {
                 return (
                     <EntryList
                         key={datum.id}
diff --git a/app/views/Project/Tagging/Sources/components/EditableEntry/index.tsx b/app/views/Project/Tagging/Sources/components/EditableEntry/index.tsx
index ffe2d7801f..4fffceba83 100644
--- a/app/views/Project/Tagging/Sources/components/EditableEntry/index.tsx
+++ b/app/views/Project/Tagging/Sources/components/EditableEntry/index.tsx
@@ -162,7 +162,7 @@ function EditableEntry(props: Props) {
         {
             refetchQueries: ['ProjectSources'],
             onCompleted: (gqlResponse) => {
-                const response = gqlResponse?.project?.entryUpdate;
+                const response = gqlResponse.project?.entryUpdate;
                 if (!response) {
                     return;
                 }
diff --git a/app/views/ProjectEdit/Framework/FrameworkDetail/index.tsx b/app/views/ProjectEdit/Framework/FrameworkDetail/index.tsx
index d9f6358fb1..3be5bd81da 100644
--- a/app/views/ProjectEdit/Framework/FrameworkDetail/index.tsx
+++ b/app/views/ProjectEdit/Framework/FrameworkDetail/index.tsx
@@ -163,7 +163,7 @@ function FrameworkDetail(props: Props) {
         {
             variables,
             onCompleted: (response) => {
-                setSelectedSection(response?.analysisFramework?.primaryTagging?.[0]?.clientId);
+                setSelectedSection(response.analysisFramework?.primaryTagging?.[0]?.clientId);
             },
         },
     );
@@ -173,7 +173,7 @@ function FrameworkDetail(props: Props) {
         () => removeNull(frameworkDetailsResponse?.analysisFramework as Framework | undefined),
         [frameworkDetailsResponse],
     );
-    const sections = frameworkDetails?.primaryTagging;
+    const sections = frameworkDetails.primaryTagging;
 
     const {
         pending: projectPatchPending,
@@ -231,9 +231,9 @@ function FrameworkDetail(props: Props) {
         frameworkId,
     });
 
-    const canEditFramework = frameworkDetails?.allowedPermissions?.includes('CAN_EDIT_FRAMEWORK');
-    const canCloneFramework = frameworkDetails?.allowedPermissions?.includes('CAN_CLONE_FRAMEWORK');
-    const canUseFramework = frameworkDetails?.allowedPermissions?.includes('CAN_USE_IN_OTHER_PROJECTS');
+    const canEditFramework = frameworkDetails.allowedPermissions.includes('CAN_EDIT_FRAMEWORK');
+    const canCloneFramework = frameworkDetails.allowedPermissions.includes('CAN_CLONE_FRAMEWORK');
+    const canUseFramework = frameworkDetails.allowedPermissions.includes('CAN_USE_IN_OTHER_PROJECTS');
 
     return (
         <div className={_cs(styles.frameworkDetail, className)}>
@@ -244,7 +244,7 @@ function FrameworkDetail(props: Props) {
             >
                 <ContainerCard
                     className={styles.frameworkItem}
-                    heading={frameworkDetails?.title ?? '-'}
+                    heading={frameworkDetails.title ?? '-'}
                     headingSize="small"
                     headerClassName={styles.header}
                     headingContainerClassName={styles.headingContainer}
@@ -252,7 +252,7 @@ function FrameworkDetail(props: Props) {
                     headingDescription={(
                         <TextOutput
                             label={_ts('projectEdit', 'createdAtLabel')}
-                            value={frameworkDetails?.createdAt && (
+                            value={frameworkDetails.createdAt && (
                                 <DateOutput
                                     value={frameworkDetails.createdAt}
                                 />
@@ -286,7 +286,7 @@ function FrameworkDetail(props: Props) {
                                             <>
                                                 <p>
                                                     { _ts('projectEdit', 'confirmUseFramework', {
-                                                        title: <b>{frameworkDetails?.title}</b>,
+                                                        title: <b>{frameworkDetails.title}</b>,
                                                     }) }
                                                 </p>
                                                 <p>
@@ -340,11 +340,11 @@ function FrameworkDetail(props: Props) {
                     contentClassName={styles.content}
                 >
                     <div className={styles.metadataContainer}>
-                        {frameworkDetails?.description}
+                        {frameworkDetails.description}
                         <TextOutput
                             className={styles.block}
                             label={_ts('projectEdit', 'frameworkCreatorTitle')}
-                            value={frameworkDetails?.createdBy?.displayName}
+                            value={frameworkDetails.createdBy?.displayName}
                             hideLabelColon
                         />
                         <TextOutput
@@ -358,13 +358,13 @@ function FrameworkDetail(props: Props) {
                             )}
                             hideLabelColon
                         />
-                        {(frameworkDetails?.visibleProjects?.length ?? 0) > 0 && (
+                        {(frameworkDetails.visibleProjects?.length ?? 0) > 0 && (
                             <TextOutput
                                 className={styles.block}
                                 label={_ts('projectEdit', 'recentlyUsedInProjectsTitle')}
                                 value={(
                                     <List
-                                        data={frameworkDetails?.visibleProjects}
+                                        data={frameworkDetails.visibleProjects}
                                         keySelector={itemKeySelector}
                                         rendererParams={itemRendererParams}
                                         renderer={Link}
@@ -440,7 +440,7 @@ function FrameworkDetail(props: Props) {
                         >
                             <Section
                                 allWidgets={undefined}
-                                widgets={frameworkDetails?.secondaryTagging}
+                                widgets={frameworkDetails.secondaryTagging}
                                 onAttributeChange={noop}
                                 attributesMap={emptyObject}
                                 error={undefined}
@@ -455,8 +455,8 @@ function FrameworkDetail(props: Props) {
             {frameworkCloneModalShown && (
                 <CloneFrameworkModal
                     frameworkToClone={frameworkId}
-                    frameworkTitle={frameworkDetails?.title}
-                    frameworkDescription={frameworkDetails?.description}
+                    frameworkTitle={frameworkDetails.title}
+                    frameworkDescription={frameworkDetails.description}
                     onCloneSuccess={handleNewFrameworkAddSuccess}
                     onModalClose={hideFrameworkCloneModal}
                 />
diff --git a/app/views/ProjectEdit/GeoAreas/RegionsMap/index.tsx b/app/views/ProjectEdit/GeoAreas/RegionsMap/index.tsx
index 2bb21a75fc..62c6aacefa 100644
--- a/app/views/ProjectEdit/GeoAreas/RegionsMap/index.tsx
+++ b/app/views/ProjectEdit/GeoAreas/RegionsMap/index.tsx
@@ -88,7 +88,7 @@ function RegionsMap(props: Props) {
 
     const handleAddRegionConfirm = useCallback(
         (value: number | undefined) => {
-            if (regions && value) {
+            if (value) {
                 regionPatchTrigger({
                     newRegion: value,
                     body: {
@@ -174,14 +174,14 @@ function RegionsMap(props: Props) {
                         nonClearable
                         disabled={navigationDisabled}
                     />
-                    {!regionsPending && (regions.length ?? 0) < 1 && (
+                    {!regionsPending && regions.length < 1 && (
                         <div className={_cs(styles.message, className)}>
                             <IoMapOutline className={styles.icon} />
                             {_ts('geoAreas', 'noGeoAreas')}
                         </div>
                     )}
                     {/* FIXME: show pending message */}
-                    {!regionsPending && (regions.length ?? 0) > 0 && !activeRegion && (
+                    {!regionsPending && regions.length > 0 && !activeRegion && (
                         <div className={_cs(styles.message, className)}>
                             <IoMapOutline className={styles.icon} />
                             No region selected
diff --git a/app/views/ProjectEdit/ProjectDetailsForm/index.tsx b/app/views/ProjectEdit/ProjectDetailsForm/index.tsx
index c7e350e08f..8a3695bb2a 100644
--- a/app/views/ProjectEdit/ProjectDetailsForm/index.tsx
+++ b/app/views/ProjectEdit/ProjectDetailsForm/index.tsx
@@ -156,7 +156,7 @@ const schema: FormSchema = {
     validation: (value) => {
         if (
             value?.startDate
-            && value?.endDate
+            && value.endDate
             && (compareDate(value.startDate, value.endDate) > 0)
         ) {
             return (_ts('projectEdit', 'endDateGreaterThanStartDate'));
@@ -363,7 +363,7 @@ function ProjectDetailsForm(props: Props) {
     const groupedStakeholders = useMemo(
         () => listToGroupList(
 
-            value?.organizations ?? [],
+            value.organizations ?? [],
             (o) => o.organizationType,
             (o) => o.organization,
         ),
@@ -375,7 +375,7 @@ function ProjectDetailsForm(props: Props) {
             const organizations = groupedStakeholders[key];
             return {
                 data: organizations
-                    ?.map((o) => stakeholderOptions.find((option) => option.id === o))
+                    .map((o) => stakeholderOptions.find((option) => option.id === o))
                     .filter(isDefined),
                 title: v.label,
                 dataPending: pendingProjectDetailsGet,
@@ -420,7 +420,7 @@ function ProjectDetailsForm(props: Props) {
                         name="title"
                         disabled={disabled}
                         onChange={setFieldValue}
-                        value={value?.title}
+                        value={value.title}
                         error={error?.title}
                         label={_ts('projectEdit', 'projectTitle')}
                         placeholder={_ts('projectEdit', 'projectTitle')}
@@ -432,7 +432,7 @@ function ProjectDetailsForm(props: Props) {
                             name="startDate"
                             disabled={disabled}
                             onChange={setFieldValue}
-                            value={value?.startDate}
+                            value={value.startDate}
                             error={error?.startDate}
                             label={_ts('projectEdit', 'projectStartDate')}
                             placeholder={_ts('projectEdit', 'projectStartDate')}
@@ -442,7 +442,7 @@ function ProjectDetailsForm(props: Props) {
                             name="endDate"
                             disabled={disabled}
                             onChange={setFieldValue}
-                            value={value?.endDate}
+                            value={value.endDate}
                             error={error?.endDate}
                             label={_ts('projectEdit', 'projectEndDate')}
                             placeholder={_ts('projectEdit', 'projectEndDate')}
@@ -453,7 +453,7 @@ function ProjectDetailsForm(props: Props) {
                         name="description"
                         disabled={disabled}
                         onChange={setFieldValue}
-                        value={value?.description}
+                        value={value.description}
                         error={error?.description}
                         label={_ts('projectEdit', 'projectDescription')}
                         placeholder={_ts('projectEdit', 'projectDescription')}
@@ -466,7 +466,7 @@ function ProjectDetailsForm(props: Props) {
                         headerActions={(
                             <AddStakeholderButton
                                 name="organizations"
-                                value={value?.organizations}
+                                value={value.organizations}
                                 onChange={setFieldValue}
                                 onOptionsChange={setStakeholderOptions}
                                 options={stakeholderOptions}
@@ -504,7 +504,7 @@ function ProjectDetailsForm(props: Props) {
                         <SegmentInput
                             className={styles.segmentInput}
                             name="isPrivate"
-                            value={value?.isPrivate}
+                            value={value.isPrivate}
                             options={projectVisibilityOptions}
                             keySelector={projectVisibilityKeySelector}
                             labelSelector={projectVisibilityLabelSelector}
diff --git a/app/views/ProjectEdit/Users/UserGroupList/index.tsx b/app/views/ProjectEdit/Users/UserGroupList/index.tsx
index c3362c7c80..4dc113578f 100644
--- a/app/views/ProjectEdit/Users/UserGroupList/index.tsx
+++ b/app/views/ProjectEdit/Users/UserGroupList/index.tsx
@@ -151,14 +151,14 @@ function UserGroupList(props: Props) {
             createStringColumn<UserGroup, number>(
                 'role',
                 'Assigned Role',
-                (item) => item?.roleDetails.title,
+                (item) => item.roleDetails.title,
             ),
             actionColumn,
         ]);
     }, [triggerDeleteUsergroup, handleEditUsergroupClick, activeUserRoleLevel]);
 
     const usergroupToEdit = useMemo(() => (
-        usergroupResponse?.results?.find((d) => d.id === usergroupIdToEdit)
+        usergroupResponse?.results.find((d) => d.id === usergroupIdToEdit)
     ), [usergroupResponse?.results, usergroupIdToEdit]);
 
     const handleAddUsergroupClick = useCallback(() => {
diff --git a/app/views/ProjectEdit/Users/UserList/AddUserModal/index.tsx b/app/views/ProjectEdit/Users/UserList/AddUserModal/index.tsx
index f58cb01d7b..a407787955 100644
--- a/app/views/ProjectEdit/Users/UserList/AddUserModal/index.tsx
+++ b/app/views/ProjectEdit/Users/UserList/AddUserModal/index.tsx
@@ -162,7 +162,7 @@ function AddUserModal(props: Props) {
         PROJECT_MEMBERSHIP_BULK,
         {
             onCompleted: (response) => {
-                if (!response?.project?.projectUserMembershipBulk) {
+                if (!response.project?.projectUserMembershipBulk) {
                     return;
                 }
                 const {
@@ -229,7 +229,7 @@ function AddUserModal(props: Props) {
     );
 
     const currentUser = useMemo(() => (
-        projectUserToEdit?.member ? [projectUserToEdit?.member] : []
+        projectUserToEdit?.member ? [projectUserToEdit.member] : []
     ), [projectUserToEdit?.member]);
 
     const roles = isDefined(activeUserRoleLevel)
diff --git a/app/views/ProjectEdit/Users/UserList/index.tsx b/app/views/ProjectEdit/Users/UserList/index.tsx
index f2e56f6e64..0e3a6732b9 100644
--- a/app/views/ProjectEdit/Users/UserList/index.tsx
+++ b/app/views/ProjectEdit/Users/UserList/index.tsx
@@ -179,7 +179,7 @@ function UserList(props: Props) {
         PROJECT_MEMBERSHIP_BULK_REMOVE,
         {
             onCompleted: (response) => {
-                if (!response?.project?.projectUserMembershipBulk) {
+                if (!response.project?.projectUserMembershipBulk) {
                     return;
                 }
                 const {
@@ -188,13 +188,13 @@ function UserList(props: Props) {
                 } = response.project.projectUserMembershipBulk;
 
                 const [err] = errors ?? [];
-                const [deletedUser] = deletedResult ?? [];
                 if (err) {
                     alert.show(
                         err,
                         { variant: 'error' },
                     );
                 }
+                const [deletedUser] = deletedResult ?? [];
                 if (deletedUser) {
                     alert.show(
                         `Successfully deleted ${deletedUser.member.displayName}`,
@@ -297,7 +297,7 @@ function UserList(props: Props) {
             createStringColumn<ProjectUser, string>(
                 'role',
                 'Assigned Role',
-                (item) => item?.role.title,
+                (item) => item.role.title,
             ),
             badgeColumn,
             actionColumn,
diff --git a/app/views/ProjectEdit/Users/index.tsx b/app/views/ProjectEdit/Users/index.tsx
index c0afce9a5b..a8fbb7143f 100644
--- a/app/views/ProjectEdit/Users/index.tsx
+++ b/app/views/ProjectEdit/Users/index.tsx
@@ -34,8 +34,8 @@ function Users(props: Props) {
         method: 'GET',
     });
 
-    const activeUserMembership = projectMembershipsResponse?.results?.[0];
-    const activeUserRoleLevel = activeUserMembership?.roleDetails?.level;
+    const activeUserMembership = projectMembershipsResponse?.results[0];
+    const activeUserRoleLevel = activeUserMembership?.roleDetails.level;
 
     return (
         <div className={styles.users}>
diff --git a/app/views/Register/RegisterForm/index.tsx b/app/views/Register/RegisterForm/index.tsx
index 98d75ad804..30ec2c9ea4 100644
--- a/app/views/Register/RegisterForm/index.tsx
+++ b/app/views/Register/RegisterForm/index.tsx
@@ -147,7 +147,7 @@ function RegisterModal(props: Props) {
             >
                 {success ? (
                     <div className={styles.registerSuccess}>
-                        {_ts('explore.register', 'checkYourEmailText', { email: value?.email })}
+                        {_ts('explore.register', 'checkYourEmailText', { email: value.email })}
                     </div>
                 ) : (
                     <>
@@ -155,7 +155,7 @@ function RegisterModal(props: Props) {
                         <TextInput
                             name="firstName"
                             onChange={setFieldValue}
-                            value={value?.firstName}
+                            value={value.firstName}
                             error={error?.firstName}
                             placeholder={_ts('explore.register', 'firstNamePlaceholder')}
                             disabled={registerPending}
@@ -163,7 +163,7 @@ function RegisterModal(props: Props) {
                         <TextInput
                             name="lastName"
                             onChange={setFieldValue}
-                            value={value?.lastName}
+                            value={value.lastName}
                             error={error?.lastName}
                             placeholder={_ts('explore.register', 'lastNamePlaceholder')}
                             disabled={registerPending}
@@ -171,7 +171,7 @@ function RegisterModal(props: Props) {
                         <TextInput
                             name="organization"
                             onChange={setFieldValue}
-                            value={value?.organization}
+                            value={value.organization}
                             error={error?.organization}
                             placeholder={_ts('explore.register', 'organizationPlaceholder')}
                             disabled={registerPending}
@@ -179,7 +179,7 @@ function RegisterModal(props: Props) {
                         <TextInput
                             name="email"
                             onChange={setFieldValue}
-                            value={value?.email}
+                            value={value.email}
                             error={error?.email}
                             placeholder={_ts('explore.register', 'emailPlaceholder')}
                             disabled={registerPending}
diff --git a/app/views/UserGroup/UserGroupItem/AddUserModal/index.tsx b/app/views/UserGroup/UserGroupItem/AddUserModal/index.tsx
index 614d64cade..bc2dd0fd28 100644
--- a/app/views/UserGroup/UserGroupItem/AddUserModal/index.tsx
+++ b/app/views/UserGroup/UserGroupItem/AddUserModal/index.tsx
@@ -104,7 +104,7 @@ function AddUserModal(props: Props) {
         trigger: triggerAddMember,
     } = useLazyRequest<Membership, FormType>({
         url: isDefined(userToEdit)
-            ? `server://group-memberships/${userToEdit?.id}/`
+            ? `server://group-memberships/${userToEdit.id}/`
             : 'server://group-memberships/',
         method: isDefined(userToEdit?.id)
             ? 'PATCH'
diff --git a/app/views/UserGroup/UserGroupItem/index.tsx b/app/views/UserGroup/UserGroupItem/index.tsx
index 1813f8a359..ebcd300d86 100644
--- a/app/views/UserGroup/UserGroupItem/index.tsx
+++ b/app/views/UserGroup/UserGroupItem/index.tsx
@@ -242,7 +242,7 @@ function UserGroupItem(props: Props) {
                         valueContainerClassName={styles.membersValue}
                         value={(
                             <NumberOutput
-                                value={userGroup.membersCount ?? 0}
+                                value={userGroup.membersCount}
                             />
                         )}
                         hideLabelColon
diff --git a/app/views/UserGroup/index.tsx b/app/views/UserGroup/index.tsx
index 15da5de7a8..d8ed914b22 100644
--- a/app/views/UserGroup/index.tsx
+++ b/app/views/UserGroup/index.tsx
@@ -43,7 +43,7 @@ function UserGroup(props: Props) {
     } = useContext(UserContext);
     const alert = useAlert();
 
-    const userId = user ? user?.id : undefined;
+    const userId = user ? user.id : undefined;
 
     const [activePage, setActivePage] = useState<number>(1);
     const [expandedUserGroupId, setExpandedUserGroupId] = useState<string>();
@@ -101,7 +101,7 @@ function UserGroup(props: Props) {
     });
 
     const usergroupObjectToEdit = useMemo(() => (
-        usergroupResponse?.results?.find((a) => a.id === userGroupToEdit)
+        usergroupResponse?.results.find((a) => a.id === userGroupToEdit)
     ), [usergroupResponse?.results, userGroupToEdit]);
 
     const handleAddUserGroupClick = useCallback(() => {
diff --git a/tsconfig.json b/tsconfig.json
index 3fdcf52907..8fd23d587f 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -32,6 +32,8 @@
         "noUnusedLocals": true,
         "noUnusedParameters": true,
 
+        "noUncheckedIndexedAccess": true,
+
         "forceConsistentCasingInFileNames": true,
         "resolveJsonModule": true,
         "skipLibCheck": true
@@ -39,6 +41,7 @@
     "include": [
         "./app/index.tsx",
         "./app/declarations",
+        "./app/utils/unsafeCommon.js",
         "./generated/types.tsx"
     ]
 }