From b8cc6296721501f486858eb43d065a711930509d Mon Sep 17 00:00:00 2001 From: Wildan M Date: Fri, 1 Nov 2024 16:27:08 +0700 Subject: [PATCH 1/2] Fix old data briefly appeared --- src/pages/workspace/categories/EditCategoryPage.tsx | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/pages/workspace/categories/EditCategoryPage.tsx b/src/pages/workspace/categories/EditCategoryPage.tsx index 330c47f0197f..0892b91fbdd3 100644 --- a/src/pages/workspace/categories/EditCategoryPage.tsx +++ b/src/pages/workspace/categories/EditCategoryPage.tsx @@ -49,11 +49,14 @@ function EditCategoryPage({route}: EditCategoryPageProps) { if (currentCategoryName !== newCategoryName) { Category.renamePolicyCategory(route.params.policyID, {oldName: currentCategoryName, newName: values.categoryName}); } - Navigation.goBack( - isQuickSettingsFlow - ? ROUTES.SETTINGS_CATEGORY_SETTINGS.getRoute(route.params.policyID, route.params.categoryName, backTo) - : ROUTES.WORKSPACE_CATEGORY_SETTINGS.getRoute(route.params.policyID, route.params.categoryName), - ); + + Navigation.setNavigationActionToMicrotaskQueue(()=>{ + Navigation.goBack( + isQuickSettingsFlow + ? ROUTES.SETTINGS_CATEGORY_SETTINGS.getRoute(route.params.policyID, route.params.categoryName, backTo) + : ROUTES.WORKSPACE_CATEGORY_SETTINGS.getRoute(route.params.policyID, route.params.categoryName), + ); + }); }, [isQuickSettingsFlow, currentCategoryName, route.params.categoryName, route.params.policyID, backTo], ); From 42bfab2432661b15f6fea561204de6f11b3aaaca Mon Sep 17 00:00:00 2001 From: Wildan Muhlis Date: Tue, 17 Dec 2024 16:07:50 +0700 Subject: [PATCH 2/2] Add comment --- src/pages/workspace/categories/EditCategoryPage.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pages/workspace/categories/EditCategoryPage.tsx b/src/pages/workspace/categories/EditCategoryPage.tsx index 7a4a59c9a98d..5cf31b7e09e4 100644 --- a/src/pages/workspace/categories/EditCategoryPage.tsx +++ b/src/pages/workspace/categories/EditCategoryPage.tsx @@ -49,8 +49,9 @@ function EditCategoryPage({route}: EditCategoryPageProps) { if (currentCategoryName !== newCategoryName) { Category.renamePolicyCategory(route.params.policyID, {oldName: currentCategoryName, newName: values.categoryName}); } - - Navigation.setNavigationActionToMicrotaskQueue(()=>{ + + // Ensure Onyx.update is executed before navigation to prevent UI blinking issues, affecting the category name and rate. + Navigation.setNavigationActionToMicrotaskQueue(() => { Navigation.goBack( isQuickSettingsFlow ? ROUTES.SETTINGS_CATEGORY_SETTINGS.getRoute(route.params.policyID, route.params.categoryName, backTo)