Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions config/eslint/eslint.seatbelt.tsv
Original file line number Diff line number Diff line change
Expand Up @@ -896,15 +896,11 @@
"../../src/pages/Debug/Transaction/DebugTransactionViolations.tsx" "no-restricted-syntax" 1
"../../src/pages/Debug/TransactionViolation/DebugTransactionViolationCreatePage.tsx" "@typescript-eslint/no-unsafe-type-assertion" 4
"../../src/pages/Debug/TransactionViolation/DebugTransactionViolationPage.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/pages/domain/Groups/PreferredWorkspaceToggle.tsx" "@typescript-eslint/no-deprecated/ConfirmModal" 1
"../../src/pages/domain/Saml/SamlLoginSectionContent.tsx" "@typescript-eslint/no-deprecated/ConfirmModal" 1
"../../src/pages/DynamicEditReportFieldPage.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/pages/DynamicReportChangeApproverPage.tsx" "react-hooks/set-state-in-effect" 1
"../../src/pages/DynamicReportDetailsPage.tsx" "@typescript-eslint/no-unsafe-type-assertion" 3
"../../src/pages/DynamicReportDetailsPage.tsx" "react-hooks/preserve-manual-memoization" 4
"../../src/pages/DynamicReportParticipantDetailsPage.tsx" "@typescript-eslint/no-deprecated/ConfirmModal" 1
"../../src/pages/DynamicReportParticipantDetailsPage.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/pages/DynamicRoomMemberDetailsPage.tsx" "@typescript-eslint/no-deprecated/ConfirmModal" 1
"../../src/pages/DynamicRoomMemberDetailsPage.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/pages/DynamicRoomMembersPage.tsx" "react-hooks/set-state-in-effect" 1
"../../src/pages/EnablePayments/shared/IdologyQuestions.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
Expand Down Expand Up @@ -972,10 +968,8 @@
"../../src/pages/iou/request/step/DynamicIOURequestStepReport.tsx" "@typescript-eslint/no-unsafe-type-assertion" 2
"../../src/pages/iou/request/step/DynamicIOURequestStepSubrate.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/pages/iou/request/step/DynamicIOURequestStepSubrate.tsx" "react-hooks/set-state-in-effect" 1
"../../src/pages/iou/request/step/DynamicIOURequestStepUpgrade.tsx" "@typescript-eslint/no-deprecated/ConfirmModal" 1
"../../src/pages/iou/request/step/DynamicIOURequestStepUpgrade.tsx" "@typescript-eslint/no-unsafe-type-assertion" 2
"../../src/pages/iou/request/step/DynamicIOURequestStepWaypoint.tsx" "@typescript-eslint/no-unsafe-type-assertion" 2
"../../src/pages/iou/request/step/IOURequestEditReportCommon.tsx" "@typescript-eslint/no-deprecated/ConfirmModal" 1
"../../src/pages/iou/request/step/IOURequestEditReportCommon.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/pages/iou/request/step/IOURequestStepAmount.tsx" "react-hooks/set-state-in-effect" 1
"../../src/pages/iou/request/step/IOURequestStepConfirmation.tsx" "@typescript-eslint/no-unsafe-type-assertion" 3
Expand Down Expand Up @@ -1071,7 +1065,6 @@
"../../src/pages/settings/Profile/PronounsPage.tsx" "react-hooks/set-state-in-effect" 1
"../../src/pages/settings/Profile/TimezoneInitialPage.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/pages/settings/Profile/TimezoneSelectPage.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/pages/settings/Rules/ExpenseRulesPage.tsx" "@typescript-eslint/no-deprecated/ConfirmModal" 1
"../../src/pages/settings/Security/AddDelegate/ConfirmDelegatePage.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/pages/settings/Security/AddDelegate/ConfirmDelegateValidateCodePage.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/pages/settings/Security/AddDelegate/UpdateDelegateRole/UpdateDelegateValidateCodePage.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
Expand Down
57 changes: 28 additions & 29 deletions src/pages/DynamicReportParticipantDetailsPage.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import UserAvatar from '@components/Avatar/UserAvatar';
import Button from '@components/ButtonComposed';
import ConfirmModal from '@components/ConfirmModal';
import HeaderWithBackButton from '@components/HeaderWithBackButton';
import MenuItemNavigation from '@components/MenuItem/presets/MenuItemNavigation';
import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
import {ModalActions} from '@components/Modal/Global/ModalContext';
import OfflineWithFeedback from '@components/OfflineWithFeedback';
import ScreenWrapper from '@components/ScreenWrapper';
import ScrollView from '@components/ScrollView';
import Text from '@components/Text';

import useConfirmModal from '@hooks/useConfirmModal';
import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
import useDynamicBackPath from '@hooks/useDynamicBackPath';
import useIsInLandscapeMode from '@hooks/useIsInLandscapeMode';
Expand Down Expand Up @@ -51,8 +52,7 @@ function DynamicReportParticipantDetails({report, route}: DynamicReportParticipa
const StyleUtils = useStyleUtils();
const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
const currentUserPersonalDetails = useCurrentUserPersonalDetails();

const [isRemoveMemberConfirmModalVisible, setIsRemoveMemberConfirmModalVisible] = React.useState(false);
const {showConfirmModal} = useConfirmModal();

const accountID = Number(route.params.accountID);
const backPath = useDynamicBackPath(DYNAMIC_ROUTES.REPORT_PARTICIPANTS_DETAILS.path);
Expand All @@ -63,10 +63,21 @@ function DynamicReportParticipantDetails({report, route}: DynamicReportParticipa
const displayName = temporaryGetDisplayNameOrDefault({passedPersonalDetails: details, translate, formatPhoneNumber});
const isCurrentUserAdmin = isGroupChatAdmin(report, currentUserPersonalDetails?.accountID);
const isSelectedMemberCurrentUser = accountID === currentUserPersonalDetails?.accountID;
const removeUser = () => {
setIsRemoveMemberConfirmModalVisible(false);
removeFromGroupChat(report, [accountID]);
Navigation.goBack(backPath);
const askForConfirmationToRemove = () => {
showConfirmModal({
buttonVariant: CONST.BUTTON_VARIANT.DANGER,
title: translate('workspace.people.removeGroupMemberButtonTitle'),
prompt: translate('workspace.people.removeMemberPrompt', displayName),
confirmText: translate('common.remove'),
cancelText: translate('common.cancel'),
}).then(({action}) => {
if (action !== ModalActions.CONFIRM) {
return;
}

removeFromGroupChat(report, [accountID]);
Navigation.goBack(backPath);
});
};

const navigateToProfile = () => {
Expand Down Expand Up @@ -105,29 +116,17 @@ function DynamicReportParticipantDetails({report, route}: DynamicReportParticipa
</Text>
)}
{isCurrentUserAdmin && (
<>
<Button
onPress={() => setIsRemoveMemberConfirmModalVisible(true)}
isDisabled={isSelectedMemberCurrentUser}
style={styles.mv5}
>
<Button.Icon
src={icons.RemoveMembers}
style={StyleUtils.getTransformScaleStyle(0.8)}
/>
<Button.Text>{translate('workspace.people.removeGroupMemberButtonTitle')}</Button.Text>
</Button>
<ConfirmModal
buttonVariant={CONST.BUTTON_VARIANT.DANGER}
title={translate('workspace.people.removeGroupMemberButtonTitle')}
isVisible={isRemoveMemberConfirmModalVisible}
onConfirm={removeUser}
onCancel={() => setIsRemoveMemberConfirmModalVisible(false)}
prompt={translate('workspace.people.removeMemberPrompt', displayName)}
confirmText={translate('common.remove')}
cancelText={translate('common.cancel')}
<Button
onPress={askForConfirmationToRemove}
isDisabled={isSelectedMemberCurrentUser}
style={styles.mv5}
>
<Button.Icon
src={icons.RemoveMembers}
style={StyleUtils.getTransformScaleStyle(0.8)}
/>
</>
<Button.Text>{translate('workspace.people.removeGroupMemberButtonTitle')}</Button.Text>
</Button>
)}
</View>
<View style={styles.w100}>
Expand Down
57 changes: 28 additions & 29 deletions src/pages/DynamicRoomMemberDetailsPage.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import UserAvatar from '@components/Avatar/UserAvatar';
import Button from '@components/ButtonComposed';
import ConfirmModal from '@components/ConfirmModal';
import HeaderWithBackButton from '@components/HeaderWithBackButton';
import MenuItemNavigation from '@components/MenuItem/presets/MenuItemNavigation';
import {ModalActions} from '@components/Modal/Global/ModalContext';
import ScreenWrapper from '@components/ScreenWrapper';
import Text from '@components/Text';

import useConfirmModal from '@hooks/useConfirmModal';
import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
import useDynamicBackPath from '@hooks/useDynamicBackPath';
import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
Expand Down Expand Up @@ -50,8 +51,7 @@ function DynamicRoomMemberDetailsPage({report, route}: DynamicRoomMemberDetailsP
const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
const policy = usePolicy(report?.policyID);
const backPath = useDynamicBackPath(DYNAMIC_ROUTES.ROOM_MEMBER_DETAILS.path);

const [isRemoveMemberConfirmModalVisible, setIsRemoveMemberConfirmModalVisible] = React.useState(false);
const {showConfirmModal} = useConfirmModal();

const accountID = Number(route.params.accountID);
const member = report?.participants?.[accountID];
Expand All @@ -61,10 +61,21 @@ function DynamicRoomMemberDetailsPage({report, route}: DynamicRoomMemberDetailsP
const isSelectedMemberCurrentUser = accountID === currentUserPersonalDetails?.accountID;
const isSelectedMemberOwner = accountID === report.ownerAccountID;
const shouldDisableRemoveUser = (isPolicyExpenseChat(report) && isPolicyAdmin(policy, details.login)) || isSelectedMemberCurrentUser || isSelectedMemberOwner;
const removeUser = () => {
setIsRemoveMemberConfirmModalVisible(false);
removeFromRoom(report, [accountID]);
Navigation.goBack(backPath);
const askForConfirmationToRemove = () => {
showConfirmModal({
buttonVariant: CONST.BUTTON_VARIANT.DANGER,
title: translate('workspace.people.removeRoomMemberButtonTitle'),
prompt: translate('workspace.people.removeMemberPrompt', displayName),
confirmText: translate('common.remove'),
cancelText: translate('common.cancel'),
}).then(({action}) => {
if (action !== ModalActions.CONFIRM) {
return;
}

removeFromRoom(report, [accountID]);
Navigation.goBack(backPath);
});
};

const navigateToProfile = () => {
Expand Down Expand Up @@ -98,29 +109,17 @@ function DynamicRoomMemberDetailsPage({report, route}: DynamicRoomMemberDetailsP
{displayName}
</Text>
)}
<>
<Button
onPress={() => setIsRemoveMemberConfirmModalVisible(true)}
isDisabled={shouldDisableRemoveUser}
style={styles.mv5}
>
<Button.Icon
src={icons.RemoveMembers}
style={StyleUtils.getTransformScaleStyle(0.8)}
/>
<Button.Text>{translate('workspace.people.removeRoomMemberButtonTitle')}</Button.Text>
</Button>
<ConfirmModal
buttonVariant={CONST.BUTTON_VARIANT.DANGER}
title={translate('workspace.people.removeRoomMemberButtonTitle')}
isVisible={isRemoveMemberConfirmModalVisible}
onConfirm={removeUser}
onCancel={() => setIsRemoveMemberConfirmModalVisible(false)}
prompt={translate('workspace.people.removeMemberPrompt', displayName)}
confirmText={translate('common.remove')}
cancelText={translate('common.cancel')}
<Button
onPress={askForConfirmationToRemove}
isDisabled={shouldDisableRemoveUser}
style={styles.mv5}
>
<Button.Icon
src={icons.RemoveMembers}
style={StyleUtils.getTransformScaleStyle(0.8)}
/>
</>
<Button.Text>{translate('workspace.people.removeRoomMemberButtonTitle')}</Button.Text>
</Button>
</View>
<View style={styles.w100}>
<MenuItemNavigation
Expand Down
24 changes: 11 additions & 13 deletions src/pages/domain/Groups/PreferredWorkspaceToggle.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import ConfirmModal from '@components/ConfirmModal';
import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
import OfflineWithFeedback from '@components/OfflineWithFeedback';

import useConfirmModal from '@hooks/useConfirmModal';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import useThemeStyles from '@hooks/useThemeStyles';
Expand All @@ -17,7 +17,7 @@ import ROUTES from '@src/ROUTES';

import {domainSecurityGroupSettingErrorsSelector, domainSecurityGroupSettingPendingActionSelector, selectGroupByID} from '@selectors/Domain';
import {createAdminPoliciesSelector, policyNameSelector} from '@selectors/Policy';
import React, {useState} from 'react';
import React from 'react';
import {View} from 'react-native';

type PreferredWorkspaceToggleProps = {
Expand All @@ -31,7 +31,7 @@ type PreferredWorkspaceToggleProps = {
function PreferredWorkspaceToggle({domainAccountID, groupID}: PreferredWorkspaceToggleProps) {
const styles = useThemeStyles();
const {translate, localeCompare} = useLocalize();
const [isNoWorkspacesModalVisible, setIsNoWorkspacesModalVisible] = useState(false);
const {showConfirmModal} = useConfirmModal();

const [group] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {
selector: selectGroupByID(groupID),
Expand Down Expand Up @@ -73,7 +73,14 @@ function PreferredWorkspaceToggle({domainAccountID, groupID}: PreferredWorkspace
shouldPlaceSubtitleBelowSwitch
isActive={isEnabled}
disabled={!hasAdminPolicies && !isEnabled}
disabledAction={() => setIsNoWorkspacesModalVisible(true)}
disabledAction={() => {
showConfirmModal({
title: translate('workspace.distanceRates.oopsNotSoFast'),
prompt: translate('domain.groups.noWorkspacesMessage'),
confirmText: translate('common.buttonConfirm'),
shouldShowCancelButton: false,
});
}}
onToggle={(enabled) => {
if (!group?.name) {
return;
Expand Down Expand Up @@ -103,15 +110,6 @@ function PreferredWorkspaceToggle({domainAccountID, groupID}: PreferredWorkspace
onCloseError={() => clearDomainSecurityGroupSettingError(domainAccountID, groupID, 'enableRestrictedPrimaryPolicyErrors')}
/>
</View>
<ConfirmModal
onConfirm={() => setIsNoWorkspacesModalVisible(false)}
onCancel={() => setIsNoWorkspacesModalVisible(false)}
isVisible={isNoWorkspacesModalVisible}
title={translate('workspace.distanceRates.oopsNotSoFast')}
prompt={translate('domain.groups.noWorkspacesMessage')}
confirmText={translate('common.buttonConfirm')}
shouldShowCancelButton={false}
/>
{(hasAdminPolicies || !!preferredPolicyName) && (
<OfflineWithFeedback
pendingAction={restrictedPrimaryPolicyIDPendingAction}
Expand Down
Loading
Loading