From e7d096c8d0850852d7ae4e38367e907ca7525532 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Thu, 7 Mar 2024 21:40:09 -0500 Subject: [PATCH 1/2] fix member selection --- src/pages/workspace/WorkspaceMembersPage.tsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/pages/workspace/WorkspaceMembersPage.tsx b/src/pages/workspace/WorkspaceMembersPage.tsx index 42f29f885c00..3970533870c1 100644 --- a/src/pages/workspace/WorkspaceMembersPage.tsx +++ b/src/pages/workspace/WorkspaceMembersPage.tsx @@ -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], From 9941f7786d8aabb8e9c6e1e6843fdae21738a596 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Thu, 7 Mar 2024 21:51:07 -0500 Subject: [PATCH 2/2] fix ts error --- tests/e2e/utils/installApp.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/e2e/utils/installApp.ts b/tests/e2e/utils/installApp.ts index b443344e6f02..dc6a9d64053f 100644 --- a/tests/e2e/utils/installApp.ts +++ b/tests/e2e/utils/installApp.ts @@ -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}`))