add comments and api changes

Expensify · Dec 13, 2024 · db57944 · db57944
1 parent 3e6c815
commit db57944
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/src/hooks/useBottomTabIsFocused.ts b/src/hooks/useBottomTabIsFocused.ts
@@ -11,12 +11,15 @@ const useBottomTabIsFocused = () => {
     const isFocused = useIsFocused();
     const topmostFullScreenName = useNavigationState<RootStackParamList, NavigationPartialRoute<FullScreenName> | undefined>(getTopmostFullScreenRoute);
     const topmostCentralPane = useNavigationState<RootStackParamList, NavigationPartialRoute<CentralPaneName> | undefined>(getTopmostCentralPaneRoute);
+    // if there is a full screen like worspace settings, not found screen, etc. then bottom tab should is not focused
     if (topmostFullScreenName) {
         return false;
     }
+    // on search screen, isFocused is returned false but it is focused
     if (shouldUseNarrowLayout) {
         return isFocused || topmostCentralPane?.name === SCREENS.SEARCH.CENTRAL_PANE;
     }
+    // on desktop screen size isFocused is always returned as false so we can't rely on it to determine if bottom tab is focused
     return isFocused || Object.keys(CENTRAL_PANE_SCREENS).includes(topmostCentralPane?.name ?? '');
 };
 

diff --git a/src/libs/actions/Welcome/index.ts b/src/libs/actions/Welcome/index.ts
@@ -207,19 +207,16 @@ function setSelfTourViewed(shouldUpdateOnyxDataOnlyLocally = false) {
 
 function dismissProductTraining(elementName: string) {
     const date = new Date();
-    // const optimisticData = [
-    //     {
-    //         onyxMethod: Onyx.METHOD.MERGE,
-    //         key: ONYXKEYS.NVP_DISMISSED_PRODUCT_TRAINING,
-    //         value: {
-    //             [elementName]: DateUtils.getDBTime(date.valueOf()),
-    //         },
-    //     },
-    // ];
-    // API.write(WRITE_COMMANDS.DISMISS_PRODUCT_TRAINING, {name: elementName}, {optimisticData});
-    Onyx.merge(ONYXKEYS.NVP_DISMISSED_PRODUCT_TRAINING, {
-        [elementName]: DateUtils.getDBTime(date.valueOf()),
-    });
+    const optimisticData = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.NVP_DISMISSED_PRODUCT_TRAINING,
+            value: {
+                [elementName]: DateUtils.getDBTime(date.valueOf()),
+            },
+        },
+    ];
+    API.write(WRITE_COMMANDS.DISMISS_PRODUCT_TRAINING, {name: elementName}, {optimisticData});
 }
 
 export {