Skip to content

Commit

Permalink
Merge pull request #37948 from Expensify/cmartins-fixMemberSelection
Browse files Browse the repository at this point in the history
Fix free policy member selection

(cherry picked from commit 86a9904)
  • Loading branch information
luacmartins authored and OSBotify committed Mar 8, 2024
1 parent 1506d47 commit fdc45ac
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
6 changes: 1 addition & 5 deletions src/pages/workspace/WorkspaceMembersPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -257,15 +257,11 @@ function WorkspaceMembersPage({policyMembers, personalDetails, route, policy, se
/** Opens the member details page */
const openMemberDetails = useCallback(
(item: MemberOption) => {
if (!isPolicyAdmin) {
if (!isPolicyAdmin || !PolicyUtils.isPaidGroupPolicy(policy)) {
Navigation.navigate(ROUTES.PROFILE.getRoute(item.accountID));
return;
}

if (!PolicyUtils.isPaidGroupPolicy(policy)) {
return;
}

Navigation.navigate(ROUTES.WORKSPACE_MEMBER_DETAILS.getRoute(route.params.policyID, item.accountID, Navigation.getActiveRoute()));
},
[isPolicyAdmin, policy, route.params.policyID],
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/utils/installApp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default function (packageName: string, path: string, platform = 'android'
execAsync(`adb uninstall ${packageName}`)
.catch((error: ExecException) => {
// Ignore errors
Logger.warn('Failed to uninstall app:', error);
Logger.warn('Failed to uninstall app:', error.message);
})
// eslint-disable-next-line @typescript-eslint/no-misused-promises
.finally(() => execAsync(`adb install ${path}`))
Expand Down

0 comments on commit fdc45ac

Please sign in to comment.