[native][web] Merge logout buttons for old and new flows

Summary:
Address [[ https://linear.app/comm/issue/ENG-9688/merge-old-and-new-logout-buttons | ENG-9688 ]].

- Removed the experimental buttons for new logout flows
- Main logout button behavior depends on `usingRestoreFlow`:
  - legacy logout (current behavior) if false
  - Primary/secondary logout if true

Depends on D14146

Test Plan: Changed the flag true/false and pressed logout button. Made sure correct procedure is executed

Reviewers: kamil, tomek

Reviewed By: kamil

Subscribers: ashoat

Differential Revision: https://phab.comm.dev/D14147

native/profile/profile-screen.react.js

@@ -274,19 +274,6 @@ class ProfileScreen extends React.PureComponent<Props> {
       );
     }
 
-    let experimentalLogoutActions;
-    if (__DEV__) {
-      experimentalLogoutActions = (
-        <>
-          <ProfileRow
-            danger
-            content="Log out (new flow)"
-            onPress={this.onPressNewLogout}
-          />
-        </>
-      );
-    }
-
     let dmActions;
     if (staffCanSee) {
       dmActions = (
@@ -353,7 +340,6 @@ class ProfileScreen extends React.PureComponent<Props> {
             {keyserverSelection}
             <ProfileRow content="Build info" onPress={this.onPressBuildInfo} />
             {developerTools}
-            {experimentalLogoutActions}
             {dmActions}
           </View>
           <View style={this.props.styles.unpaddedSection}>
@@ -372,6 +358,11 @@ class ProfileScreen extends React.PureComponent<Props> {
     if (this.loggedOutOrLoggingOut) {
       return;
     }
+    if (usingRestoreFlow) {
+      this.onPressNewLogout();
+      return;
+    }
+
     if (!this.props.isAccountWithPassword) {
       Alert.alert(
         'Log out',

web/settings/account-settings.react.js

@@ -25,8 +25,8 @@ import {
   createOlmSessionsWithOwnDevices,
   getContentSigningKey,
 } from 'lib/utils/crypto-utils.js';
-import { isDev } from 'lib/utils/dev-utils.js';
 import { useDispatchActionPromise } from 'lib/utils/redux-promise-utils.js';
+import { usingRestoreFlow } from 'lib/utils/services-utils.js';
 
 import css from './account-settings.css';
 import AppearanceChangeModal from './appearance-change-modal.react.js';
@@ -54,18 +54,20 @@ function AccountSettings(): React.Node {
 
   const sendSecondaryDeviceLogoutRequest = useSecondaryDeviceLogOut();
   const dispatchActionPromise = useDispatchActionPromise();
-  const logOutUser = React.useCallback(
-    () => dispatchActionPromise(logOutActionTypes, sendLogoutRequest()),
-    [dispatchActionPromise, sendLogoutRequest],
-  );
-  const logOutSecondaryDevice = React.useCallback(
-    () =>
-      dispatchActionPromise(
+  const logOutUser = React.useCallback(() => {
+    if (usingRestoreFlow) {
+      return dispatchActionPromise(
         logOutActionTypes,
         sendSecondaryDeviceLogoutRequest(),
-      ),
-    [dispatchActionPromise, sendSecondaryDeviceLogoutRequest],
-  );
+      );
+    }
+    return dispatchActionPromise(logOutActionTypes, sendLogoutRequest());
+  }, [
+    dispatchActionPromise,
+    sendLogoutRequest,
+    sendSecondaryDeviceLogoutRequest,
+  ]);
+
   const identityContext = React.useContext(IdentityClientContext);
 
   const userID = useSelector(state => state.currentUserInfo?.id);
@@ -170,18 +172,6 @@ function AccountSettings(): React.Node {
     return null;
   }
 
-  let experimentalLogOutSection;
-  if (isDev) {
-    experimentalLogOutSection = (
-      <li>
-        <span>Log out secondary device</span>
-        <Button variant="text" onClick={logOutSecondaryDevice}>
-          <p className={css.buttonText}>Log out</p>
-        </Button>
-      </li>
-    );
-  }
-
   let preferences;
   if (staffCanSee) {
     preferences = (
@@ -310,7 +300,6 @@ function AccountSettings(): React.Node {
                 <p className={css.buttonText}>Log out</p>
               </Button>
             </li>
-            {experimentalLogOutSection}
             <li>
               <span>Friend List</span>
               <Button variant="text" onClick={openFriendList}>