Revert "use optional chaining"

This reverts commit 8433620.
Expensify · Aug 28, 2023 · 345485d · 345485d
1 parent 8433620
commit 345485d
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/src/pages/home/report/ReportActionCompose/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose/ReportActionCompose.js
@@ -183,7 +183,7 @@ function ReportActionCompose({
         if (!isKeyboardVisibleWhenShowingModalRef.current) {
             return;
         }
-        composerRef?.current?.focus(true);
+        composerRef.current.focus(true);
         isKeyboardVisibleWhenShowingModalRef.current = false;
     }, []);
 
@@ -197,9 +197,9 @@ function ReportActionCompose({
 
     const onAddActionPressed = useCallback(() => {
         if (!willBlurTextInputOnTapOutside) {
-            isKeyboardVisibleWhenShowingModalRef.current = composerRef?.current?.isFocused();
+            isKeyboardVisibleWhenShowingModalRef.current = composerRef.current.isFocused();
         }
-        composerRef?.current?.blur();
+        composerRef.current.blur();
     }, []);
 
     const updateShouldShowSuggestionMenuToFalse = useCallback(() => {
@@ -218,7 +218,7 @@ function ReportActionCompose({
             // We don't really care about saving the draft the user was typing
             // We need to make sure an empty draft gets saved instead
             debouncedSaveReportComment.cancel();
-            const newComment = composerRef?.current?.prepareCommentAndResetComposer();
+            const newComment = composerRef.current.prepareCommentAndResetComposer();
             Report.addAttachment(reportID, file, newComment);
             setTextInputShouldClear(false);
         },
@@ -250,7 +250,7 @@ function ReportActionCompose({
             // We need to make sure an empty draft gets saved instead
             debouncedSaveReportComment.cancel();
 
-            const newComment = composerRef?.current?.prepareCommentAndResetComposer();
+            const newComment = composerRef.current.prepareCommentAndResetComposer();
             if (!newComment) {
                 return;
             }
@@ -403,8 +403,13 @@ function ReportActionCompose({
                     {DeviceCapabilities.canUseTouchScreen() && isMediumScreenWidth ? null : (
                         <EmojiPickerButton
                             isDisabled={isBlockedFromConcierge || disabled}
-                            onModalHide={() => composerRef?.current?.focus(true)}
-                            onEmojiSelected={(...args) => composerRef?.current?.replaceSelectionWithText(...args)}
+                            onModalHide={() => {
+                                if (composerRef === null || composerRef.current === null) {
+                                    return;
+                                }
+                                composerRef.current.focus(true);
+                            }}
+                            onEmojiSelected={(...args) => composerRef.current.replaceSelectionWithText(...args)}
                             emojiPickerID={report.reportID}
                         />
                     )}