From 0634feba2374d788f1ebd92709548a6f8e6927bb Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Wed, 22 Jan 2025 15:53:38 +0700 Subject: [PATCH 1/7] fix: Update a couple system messages to match existing formatting --- src/languages/en.ts | 4 ++-- src/languages/es.ts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index 0a9f71e5888d..f224a359b704 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -4891,8 +4891,8 @@ const translations = { stripePaid: ({amount, currency}: StripePaidParams) => `paid ${currency}${amount}`, takeControl: `took control`, integrationSyncFailed: ({label, errorMessage}: IntegrationSyncFailedParams) => `failed to sync with ${label}${errorMessage ? ` ("${errorMessage}")` : ''}`, - addEmployee: ({email, role}: AddEmployeeParams) => `added ${email} as ${role === 'member' || role === 'user' ? 'member' : 'admin'}`, - updateRole: ({email, currentRole, newRole}: UpdateRoleParams) => `updated the role of ${email} from ${currentRole} to ${newRole}`, + addEmployee: ({email, role}: AddEmployeeParams) => `added ${email} as ${role === 'member' || role === 'user' ? 'a member' : 'a admin'}`, + updateRole: ({email, currentRole, newRole}: UpdateRoleParams) => `updated the role of ${email} to ${newRole} (previously ${currentRole})`, removeMember: ({email, role}: AddEmployeeParams) => `removed ${role} ${email}`, removedConnection: ({connectionName}: ConnectionNameParams) => `removed connection to ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[connectionName]}`, }, diff --git a/src/languages/es.ts b/src/languages/es.ts index 225895a5424e..85777fa303e1 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -4942,9 +4942,9 @@ const translations = { integrationSyncFailed: ({label, errorMessage}: IntegrationSyncFailedParams) => `no se pudo sincronizar con ${label}${errorMessage ? ` ("${errorMessage}")` : ''}`, addEmployee: ({email, role}: AddEmployeeParams) => `agregó a ${email} como ${role === 'miembro' || role === 'user' ? 'miembro' : 'administrador'}`, updateRole: ({email, currentRole, newRole}: UpdateRoleParams) => - `actualicé el rol ${email} de ${currentRole === 'miembro' || currentRole === 'user' ? 'miembro' : 'administrador'} a ${ - newRole === 'miembro' || newRole === 'user' ? 'miembro' : 'administrador' - }`, + `actualicé el rol ${email} a ${newRole === 'miembro' || newRole === 'user' ? 'miembro' : 'administrador'} (previamente ${ + currentRole === 'miembro' || currentRole === 'user' ? 'miembro' : 'administrador' + })`, removeMember: ({email, role}: AddEmployeeParams) => `eliminado ${role === 'miembro' || role === 'user' ? 'miembro' : 'administrador'} ${email}`, removedConnection: ({connectionName}: ConnectionNameParams) => `eliminó la conexión a ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[connectionName]}`, }, From b0e24f4bd49a5bab5c830e0c790a105d5863de32 Mon Sep 17 00:00:00 2001 From: nkdengineer <161821005+nkdengineer@users.noreply.github.com> Date: Thu, 23 Jan 2025 10:44:39 +0700 Subject: [PATCH 2/7] Update src/languages/en.ts Co-authored-by: rayane-djouah <77965000+rayane-djouah@users.noreply.github.com> --- src/languages/en.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index f224a359b704..51162309f92b 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -4891,7 +4891,7 @@ const translations = { stripePaid: ({amount, currency}: StripePaidParams) => `paid ${currency}${amount}`, takeControl: `took control`, integrationSyncFailed: ({label, errorMessage}: IntegrationSyncFailedParams) => `failed to sync with ${label}${errorMessage ? ` ("${errorMessage}")` : ''}`, - addEmployee: ({email, role}: AddEmployeeParams) => `added ${email} as ${role === 'member' || role === 'user' ? 'a member' : 'a admin'}`, + addEmployee: ({email, role}: AddEmployeeParams) => `added ${email} as ${role === 'member' || role === 'user' ? 'a member' : 'an admin'}`, updateRole: ({email, currentRole, newRole}: UpdateRoleParams) => `updated the role of ${email} to ${newRole} (previously ${currentRole})`, removeMember: ({email, role}: AddEmployeeParams) => `removed ${role} ${email}`, removedConnection: ({connectionName}: ConnectionNameParams) => `removed connection to ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[connectionName]}`, From 4b34e302ef39a0ee79cb6732b006a56b6f9a629b Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Sat, 25 Jan 2025 18:07:09 +0700 Subject: [PATCH 3/7] update translation --- src/languages/en.ts | 5 +++-- src/languages/es.ts | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index 7c715d225aac..068ac3434cde 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -4919,8 +4919,9 @@ const translations = { takeControl: `took control`, integrationSyncFailed: ({label, errorMessage}: IntegrationSyncFailedParams) => `failed to sync with ${label}${errorMessage ? ` ("${errorMessage}")` : ''}`, addEmployee: ({email, role}: AddEmployeeParams) => `added ${email} as ${role === 'member' || role === 'user' ? 'a member' : 'an admin'}`, - updateRole: ({email, currentRole, newRole}: UpdateRoleParams) => `updated the role of ${email} to ${newRole} (previously ${currentRole})`, - removeMember: ({email, role}: AddEmployeeParams) => `removed ${role} ${email}`, + updateRole: ({email, currentRole, newRole}: UpdateRoleParams) => + `updated the role of ${email} to ${newRole} (previously ${currentRole === 'member' || currentRole === 'user' ? 'member' : 'admin'})`, + removeMember: ({email, role}: AddEmployeeParams) => `removed ${role === 'member' || role === 'user' ? 'member' : 'admin'} ${email}`, removedConnection: ({connectionName}: ConnectionNameParams) => `removed connection to ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[connectionName]}`, }, }, diff --git a/src/languages/es.ts b/src/languages/es.ts index 3a65bce214fd..f6f7dbc58b61 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -4969,7 +4969,7 @@ const translations = { integrationSyncFailed: ({label, errorMessage}: IntegrationSyncFailedParams) => `no se pudo sincronizar con ${label}${errorMessage ? ` ("${errorMessage}")` : ''}`, addEmployee: ({email, role}: AddEmployeeParams) => `agregó a ${email} como ${role === 'miembro' || role === 'user' ? 'miembro' : 'administrador'}`, updateRole: ({email, currentRole, newRole}: UpdateRoleParams) => - `actualicé el rol ${email} a ${newRole === 'miembro' || newRole === 'user' ? 'miembro' : 'administrador'} (previamente ${ + `actualizó el rol ${email} a ${newRole === 'miembro' || newRole === 'user' ? 'miembro' : 'administrador'} (previamente ${ currentRole === 'miembro' || currentRole === 'user' ? 'miembro' : 'administrador' })`, removeMember: ({email, role}: AddEmployeeParams) => `eliminado ${role === 'miembro' || role === 'user' ? 'miembro' : 'administrador'} ${email}`, From 1b7fb4eee4dbc87c268b7ff3472ceb848a837cdb Mon Sep 17 00:00:00 2001 From: nkdengineer <161821005+nkdengineer@users.noreply.github.com> Date: Sun, 2 Feb 2025 00:05:53 +0700 Subject: [PATCH 4/7] Update src/languages/en.ts Co-authored-by: rayane-djouah <77965000+rayane-djouah@users.noreply.github.com> --- src/languages/en.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index 068ac3434cde..2734e31c828d 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -4920,7 +4920,7 @@ const translations = { integrationSyncFailed: ({label, errorMessage}: IntegrationSyncFailedParams) => `failed to sync with ${label}${errorMessage ? ` ("${errorMessage}")` : ''}`, addEmployee: ({email, role}: AddEmployeeParams) => `added ${email} as ${role === 'member' || role === 'user' ? 'a member' : 'an admin'}`, updateRole: ({email, currentRole, newRole}: UpdateRoleParams) => - `updated the role of ${email} to ${newRole} (previously ${currentRole === 'member' || currentRole === 'user' ? 'member' : 'admin'})`, + `updated the role of ${email} to ${newRole === 'member' || newRole === 'user' ? 'member' : 'admin'} (previously ${currentRole === 'member' || currentRole === 'user' ? 'member' : 'admin'})`, removeMember: ({email, role}: AddEmployeeParams) => `removed ${role === 'member' || role === 'user' ? 'member' : 'admin'} ${email}`, removedConnection: ({connectionName}: ConnectionNameParams) => `removed connection to ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[connectionName]}`, }, From 33255956120b03de0d5cf519dde660705392597c Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Mon, 3 Feb 2025 10:46:34 +0700 Subject: [PATCH 5/7] fix lint --- src/languages/en.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index b03ca8f46bf8..127ce2aa6df8 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -4959,7 +4959,9 @@ const translations = { integrationSyncFailed: ({label, errorMessage}: IntegrationSyncFailedParams) => `failed to sync with ${label}${errorMessage ? ` ("${errorMessage}")` : ''}`, addEmployee: ({email, role}: AddEmployeeParams) => `added ${email} as ${role === 'member' || role === 'user' ? 'a member' : 'an admin'}`, updateRole: ({email, currentRole, newRole}: UpdateRoleParams) => - `updated the role of ${email} to ${newRole === 'member' || newRole === 'user' ? 'member' : 'admin'} (previously ${currentRole === 'member' || currentRole === 'user' ? 'member' : 'admin'})`, + `updated the role of ${email} to ${newRole === 'member' || newRole === 'user' ? 'member' : 'admin'} (previously ${ + currentRole === 'member' || currentRole === 'user' ? 'member' : 'admin' + })`, removeMember: ({email, role}: AddEmployeeParams) => `removed ${role === 'member' || role === 'user' ? 'member' : 'admin'} ${email}`, removedConnection: ({connectionName}: ConnectionNameParams) => `removed connection to ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[connectionName]}`, }, From 2a2b858b9db83ec6e0ef761858335e932c4f50cb Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Tue, 4 Feb 2025 10:53:22 +0700 Subject: [PATCH 6/7] fix update role --- src/languages/en.ts | 4 ++-- src/libs/actions/App.ts | 2 +- .../sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index 127ce2aa6df8..f0f52a066af2 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -4959,8 +4959,8 @@ const translations = { integrationSyncFailed: ({label, errorMessage}: IntegrationSyncFailedParams) => `failed to sync with ${label}${errorMessage ? ` ("${errorMessage}")` : ''}`, addEmployee: ({email, role}: AddEmployeeParams) => `added ${email} as ${role === 'member' || role === 'user' ? 'a member' : 'an admin'}`, updateRole: ({email, currentRole, newRole}: UpdateRoleParams) => - `updated the role of ${email} to ${newRole === 'member' || newRole === 'user' ? 'member' : 'admin'} (previously ${ - currentRole === 'member' || currentRole === 'user' ? 'member' : 'admin' + `updated the role of ${email} to ${newRole === 'member' || newRole === 'user' ? 'member' : newRole} (previously ${ + currentRole === 'member' || currentRole === 'user' ? 'member' : currentRole })`, removeMember: ({email, role}: AddEmployeeParams) => `removed ${role === 'member' || role === 'user' ? 'member' : 'admin'} ${email}`, removedConnection: ({connectionName}: ConnectionNameParams) => `removed connection to ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[connectionName]}`, diff --git a/src/libs/actions/App.ts b/src/libs/actions/App.ts index 9c673288589e..38a931a81d6b 100644 --- a/src/libs/actions/App.ts +++ b/src/libs/actions/App.ts @@ -414,7 +414,7 @@ function createWorkspaceWithPolicyDraftAndNavigateToIt( Navigation.goBack(); } savePolicyDraftByNewWorkspace(policyIDWithDefault, policyName, policyOwnerEmail, makeMeAdmin, currency, file); - Navigation.navigate(ROUTES.WORKSPACE_INITIAL.getRoute(policyIDWithDefault, backTo)); + Navigation.navigate(ROUTES.WORKSPACE_INITIAL.getRoute(policyIDWithDefault, backTo), CONST.NAVIGATION.TYPE.UP); }) .then(endSignOnTransition); } diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx index ca90fc45997e..5b4084a87d96 100644 --- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx +++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx @@ -533,7 +533,7 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu, isE }, ] : []), - ...(!isLoading && shouldShowNewWorkspaceButton + ...(true ? [ { displayInDefaultIconColor: true, From be5511bd15f269f5416bc9eef02cf698c4556874 Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Tue, 4 Feb 2025 11:10:05 +0700 Subject: [PATCH 7/7] fix lint --- src/libs/actions/App.ts | 2 +- .../sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/actions/App.ts b/src/libs/actions/App.ts index 38a931a81d6b..9c673288589e 100644 --- a/src/libs/actions/App.ts +++ b/src/libs/actions/App.ts @@ -414,7 +414,7 @@ function createWorkspaceWithPolicyDraftAndNavigateToIt( Navigation.goBack(); } savePolicyDraftByNewWorkspace(policyIDWithDefault, policyName, policyOwnerEmail, makeMeAdmin, currency, file); - Navigation.navigate(ROUTES.WORKSPACE_INITIAL.getRoute(policyIDWithDefault, backTo), CONST.NAVIGATION.TYPE.UP); + Navigation.navigate(ROUTES.WORKSPACE_INITIAL.getRoute(policyIDWithDefault, backTo)); }) .then(endSignOnTransition); } diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx index 5b4084a87d96..ca90fc45997e 100644 --- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx +++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx @@ -533,7 +533,7 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu, isE }, ] : []), - ...(true + ...(!isLoading && shouldShowNewWorkspaceButton ? [ { displayInDefaultIconColor: true,