From e47da439d464e81fe448032709bb2b2f0d76b8fe Mon Sep 17 00:00:00 2001 From: Hayata Suenaga Date: Wed, 24 Apr 2024 21:13:39 -0400 Subject: [PATCH 1/7] fix: don't mute text --- .../workspace/categories/WorkspaceCategoriesSettingsPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx b/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx index 0ebfcde6f97b..064303dc5096 100644 --- a/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx +++ b/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx @@ -59,7 +59,7 @@ function WorkspaceCategoriesSettingsPage({route, policyCategories}: WorkspaceCat > - {translate('workspace.categories.requiresCategory')} + {translate('workspace.categories.requiresCategory')} Date: Thu, 25 Apr 2024 09:40:54 -0400 Subject: [PATCH 2/7] fix: the toggle text style on the tags screen --- src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx index b421698b8f2f..62d375213e38 100644 --- a/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx +++ b/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx @@ -63,7 +63,7 @@ function WorkspaceTagsSettingsPage({route, policyTags}: WorkspaceTagsSettingsPag > - {translate('workspace.tags.requiresTag')} + {translate('workspace.tags.requiresTag')} Date: Wed, 1 May 2024 16:08:38 -0700 Subject: [PATCH 3/7] fix: don't make the toggle text bold --- .../workspace/categories/WorkspaceCategoriesSettingsPage.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx b/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx index 3b4947b02c56..0ae8db7b6bda 100644 --- a/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx +++ b/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx @@ -52,6 +52,7 @@ function WorkspaceCategoriesSettingsPage({policy, route}: WorkspaceCategoriesSet wrapperStyle={[styles.mt2, styles.mh4]} errors={policy?.errorFields?.requiresCategory ?? undefined} onCloseError={() => Policy.clearPolicyErrorField(policy?.id ?? '', 'requiresCategory')} + shouldPlaceSubtitleBelowSwitch /> From 9003dea3ed1772ca4ebfddc0ca5a27ed036085cf Mon Sep 17 00:00:00 2001 From: Hayata Suenaga Date: Wed, 1 May 2024 16:17:57 -0700 Subject: [PATCH 4/7] fix: update the UI text --- src/languages/en.ts | 2 +- src/languages/es.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index 7513d929c085..e801cbb14ce9 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -2007,7 +2007,7 @@ export default { enableCategory: 'Enable category', deleteFailureMessage: 'An error occurred while deleting the category, please try again.', categoryName: 'Category name', - requiresCategory: 'Members must categorize all spend', + requiresCategory: 'Members must categorize all expenses', needCategoryForExportToIntegration: 'A category is required on every expense in order to export to', subtitle: 'Get a better overview of where money is being spent. Use our default categories or add your own.', emptyCategories: { diff --git a/src/languages/es.ts b/src/languages/es.ts index e1a1a24a8bff..b51daa845660 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -2034,7 +2034,7 @@ export default { enableCategory: 'Activar categoría', deleteFailureMessage: 'Se ha producido un error al intentar eliminar la categoría. Por favor, inténtalo más tarde.', categoryName: 'Nombre de la categoría', - requiresCategory: 'Los miembros deben categorizar todos los gastos', + requiresCategory: 'Los diputados deben clasificar todos los gastos', needCategoryForExportToIntegration: 'Se requiere una categoría en cada gasto para poder exportarlo a', subtitle: 'Obtén una visión general de dónde te gastas el dinero. Utiliza las categorías predeterminadas o añade las tuyas propias.', emptyCategories: { From b9d51e9bb2e1069d30b09c8aeb869512e5636c36 Mon Sep 17 00:00:00 2001 From: Hayata Suenaga Date: Thu, 2 May 2024 11:05:36 -0700 Subject: [PATCH 5/7] fix: spanish translation --- src/languages/es.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/es.ts b/src/languages/es.ts index b51daa845660..3c4d280e9101 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -2034,7 +2034,7 @@ export default { enableCategory: 'Activar categoría', deleteFailureMessage: 'Se ha producido un error al intentar eliminar la categoría. Por favor, inténtalo más tarde.', categoryName: 'Nombre de la categoría', - requiresCategory: 'Los diputados deben clasificar todos los gastos', + requiresCategory: 'Los miembros deben clasificar todos los gastos', needCategoryForExportToIntegration: 'Se requiere una categoría en cada gasto para poder exportarlo a', subtitle: 'Obtén una visión general de dónde te gastas el dinero. Utiliza las categorías predeterminadas o añade las tuyas propias.', emptyCategories: { From ecc3ecee01b4b7e31d976768d9d81bd5d7b8d462 Mon Sep 17 00:00:00 2001 From: Hayata Suenaga Date: Fri, 10 May 2024 19:12:27 -0700 Subject: [PATCH 6/7] fix: do not mute the text next to Switch for requiring tags --- src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx index 90b8dc16952a..200508ebb852 100644 --- a/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx +++ b/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx @@ -60,7 +60,7 @@ function WorkspaceTagsSettingsPage({route, policyTags}: WorkspaceTagsSettingsPag > - {translate('workspace.tags.requiresTag')} + {translate('workspace.tags.requiresTag')} Date: Mon, 13 May 2024 08:13:29 -0700 Subject: [PATCH 7/7] fix: spacing --- src/pages/workspace/workflows/ToggleSettingsOptionRow.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/workspace/workflows/ToggleSettingsOptionRow.tsx b/src/pages/workspace/workflows/ToggleSettingsOptionRow.tsx index 071115b32c0e..bbabb9965b9a 100644 --- a/src/pages/workspace/workflows/ToggleSettingsOptionRow.tsx +++ b/src/pages/workspace/workflows/ToggleSettingsOptionRow.tsx @@ -54,8 +54,8 @@ function ToggleSettingOptionRow({ const styles = useThemeStyles(); const subTitleView = useMemo( - () => {subtitle}, - [shouldPlaceSubtitleBelowSwitch, subtitle, styles.mr5, styles.mt1, styles.mt4, styles.textLabel, styles.textSupporting], + () => {subtitle}, + [shouldPlaceSubtitleBelowSwitch, subtitle, styles.mr5, styles.mt1, styles.textLabel, styles.textSupporting], ); return (