Merge pull request #55451 from thesahindia/revert-53938

Expensify · Jan 18, 2025 · 86b9c79 · 86b9c79
2 parents dc7bd0e + 7c4e3d7
commit 86b9c79
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 191 deletions.
diff --git a/src/components/Accordion/index.native.tsx b/src/components/Accordion/index.native.tsx
diff --git a/src/components/Accordion/index.tsx b/src/components/Accordion/index.tsx
diff --git a/src/libs/Navigation/linkTo/index.ts b/src/libs/Navigation/linkTo/index.ts
@@ -183,13 +183,7 @@ export default function linkTo(navigation: NavigationContainerRef<RootStackParam
         }
     }
 
-    if (
-        action &&
-        'payload' in action &&
-        action.payload &&
-        'name' in action.payload &&
-        (isSideModalNavigator(action.payload.name) || action.payload.name === NAVIGATORS.FULL_SCREEN_NAVIGATOR)
-    ) {
+    if (action && 'payload' in action && action.payload && 'name' in action.payload && isSideModalNavigator(action.payload.name)) {
         // Information about the state may be in the params.
         const currentFocusedRoute = findFocusedRoute(extrapolateStateFromParams(rootState));
         const targetFocusedRoute = findFocusedRoute(stateFromPath);
@@ -207,7 +201,7 @@ export default function linkTo(navigation: NavigationContainerRef<RootStackParam
             // There are situations where a route already exists on the current navigation stack
             // But we want to push the same route instead of going back in the stack
             // Which would break the user navigation history
-            if ((!isActiveRoute && type === CONST.NAVIGATION.ACTION_TYPE.PUSH) || action.payload.name === NAVIGATORS.FULL_SCREEN_NAVIGATOR) {
+            if (!isActiveRoute && type === CONST.NAVIGATION.ACTION_TYPE.PUSH) {
                 minimalAction.type = CONST.NAVIGATION.ACTION_TYPE.PUSH;
             }
             root.dispatch(minimalAction);

diff --git a/src/pages/workspace/workflows/ToggleSettingsOptionRow.tsx b/src/pages/workspace/workflows/ToggleSettingsOptionRow.tsx
@@ -1,9 +1,7 @@
 import type {ReactNode} from 'react';
-import React, {useEffect, useMemo} from 'react';
+import React, {useMemo} from 'react';
 import {View} from 'react-native';
 import type {StyleProp, TextStyle, ViewStyle} from 'react-native';
-import {useSharedValue} from 'react-native-reanimated';
-import Accordion from '@components/Accordion';
 import Icon from '@components/Icon';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import RenderHTML from '@components/RenderHTML';
@@ -48,9 +46,6 @@ type ToggleSettingOptionRowProps = {
     /** Used to apply styles to the Subtitle */
     subtitleStyle?: StyleProp<TextStyle>;
 
-    /** Used to apply styles to the Accordion */
-    accordionStyle?: StyleProp<ViewStyle>;
-
     /** Whether the option is enabled or not */
     isActive: boolean;
 
@@ -86,7 +81,6 @@ function ToggleSettingOptionRow({
     customTitle,
     subtitle,
     subtitleStyle,
-    accordionStyle,
     switchAccessibilityLabel,
     shouldPlaceSubtitleBelowSwitch,
     shouldEscapeText = undefined,
@@ -104,12 +98,6 @@ function ToggleSettingOptionRow({
     showLockIcon = false,
 }: ToggleSettingOptionRowProps) {
     const styles = useThemeStyles();
-    const isExpanded = useSharedValue(isActive);
-    const isToggleTriggered = useSharedValue(false);
-
-    useEffect(() => {
-        isExpanded.set(isActive);
-    }, [isExpanded, isActive]);
 
     const subtitleHtml = useMemo(() => {
         if (!subtitle || !shouldParseSubtitle || typeof subtitle !== 'string') {
@@ -183,23 +171,14 @@ function ToggleSettingOptionRow({
                     <Switch
                         disabledAction={disabledAction}
                         accessibilityLabel={switchAccessibilityLabel}
-                        onToggle={(isOn) => {
-                            isToggleTriggered.set(true);
-                            onToggle(isOn);
-                        }}
+                        onToggle={onToggle}
                         isOn={isActive}
                         disabled={disabled}
                         showLockIcon={showLockIcon}
                     />
                 </View>
                 {shouldPlaceSubtitleBelowSwitch && subtitle && subTitleView}
-                <Accordion
-                    isExpanded={isExpanded}
-                    style={accordionStyle}
-                    isToggleTriggered={isToggleTriggered}
-                >
-                    {subMenuItems}
-                </Accordion>
+                {isActive && subMenuItems}
             </View>
         </OfflineWithFeedback>
     );