From 4debc05d858ea0817f366faff4ea74c67a79951a Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 7 May 2026 14:18:36 +0000 Subject: [PATCH 1/2] Remove feature flag override key during async storage reset Agent-Logs-Url: https://github.com/department-of-veterans-affairs/va-mobile-app/sessions/5d11d2f4-1930-4498-9671-39efd95fc160 Co-authored-by: dumathane <46909588+dumathane@users.noreply.github.com> --- .../SettingsScreen/DeveloperScreen/DeveloperScreen.test.tsx | 2 ++ .../SettingsScreen/DeveloperScreen/DeveloperScreen.tsx | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/VAMobile/src/screens/HomeScreen/ProfileScreen/SettingsScreen/DeveloperScreen/DeveloperScreen.test.tsx b/VAMobile/src/screens/HomeScreen/ProfileScreen/SettingsScreen/DeveloperScreen/DeveloperScreen.test.tsx index 645a8f9ef26..33c15501865 100644 --- a/VAMobile/src/screens/HomeScreen/ProfileScreen/SettingsScreen/DeveloperScreen/DeveloperScreen.test.tsx +++ b/VAMobile/src/screens/HomeScreen/ProfileScreen/SettingsScreen/DeveloperScreen/DeveloperScreen.test.tsx @@ -27,6 +27,7 @@ jest.mock('utils/homeScreenAlerts', () => { jest.mock('@react-native-async-storage/async-storage', () => ({ setItem: jest.fn(), getItem: jest.fn(), + removeItem: jest.fn(), clear: jest.fn(), })) @@ -109,6 +110,7 @@ context('DeveloperScreen', () => { const latestAlertMockCall = mockAlertSpy.mock.calls.at(-1)[0] latestAlertMockCall.buttons[1].onPress() + await waitFor(() => expect(AsyncStorage.removeItem).toHaveBeenCalledWith('@store_remote_config_overrides')) await waitFor(() => expect(AsyncStorage.clear).toHaveBeenCalled()) expect(mockDispatchSpy).toHaveBeenCalled() }) diff --git a/VAMobile/src/screens/HomeScreen/ProfileScreen/SettingsScreen/DeveloperScreen/DeveloperScreen.tsx b/VAMobile/src/screens/HomeScreen/ProfileScreen/SettingsScreen/DeveloperScreen/DeveloperScreen.tsx index 0ce7d9a706f..ba4188dcb26 100644 --- a/VAMobile/src/screens/HomeScreen/ProfileScreen/SettingsScreen/DeveloperScreen/DeveloperScreen.tsx +++ b/VAMobile/src/screens/HomeScreen/ProfileScreen/SettingsScreen/DeveloperScreen/DeveloperScreen.tsx @@ -40,6 +40,7 @@ import { } from 'utils/homeScreenAlerts' import { useAlert, useAppDispatch, useGiveFeedback, useRouteNavigation, useTheme } from 'utils/hooks' import { STORAGE_REVIEW_EVENT_KEY, resetReviewActionCount } from 'utils/inAppReviews' +import { REMOTE_CONFIG_OVERRIDES_KEY } from 'utils/remoteConfig' type DeveloperScreenSettingsScreenProps = StackScreenProps @@ -157,7 +158,8 @@ function DeveloperScreen({ navigation }: DeveloperScreenSettingsScreenProps) { }, { text: t('reset'), - onPress: () => { + onPress: async () => { + await AsyncStorage.removeItem(REMOTE_CONFIG_OVERRIDES_KEY) AsyncStorage.clear() dispatch(logout()) }, From 9bf5a5a29350aa87b7673eec93e0e18abf8fc992 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 7 May 2026 14:20:16 +0000 Subject: [PATCH 2/2] Await async storage clear before logout on reset Agent-Logs-Url: https://github.com/department-of-veterans-affairs/va-mobile-app/sessions/5d11d2f4-1930-4498-9671-39efd95fc160 Co-authored-by: dumathane <46909588+dumathane@users.noreply.github.com> --- .../SettingsScreen/DeveloperScreen/DeveloperScreen.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VAMobile/src/screens/HomeScreen/ProfileScreen/SettingsScreen/DeveloperScreen/DeveloperScreen.tsx b/VAMobile/src/screens/HomeScreen/ProfileScreen/SettingsScreen/DeveloperScreen/DeveloperScreen.tsx index ba4188dcb26..3f99326ca10 100644 --- a/VAMobile/src/screens/HomeScreen/ProfileScreen/SettingsScreen/DeveloperScreen/DeveloperScreen.tsx +++ b/VAMobile/src/screens/HomeScreen/ProfileScreen/SettingsScreen/DeveloperScreen/DeveloperScreen.tsx @@ -160,7 +160,7 @@ function DeveloperScreen({ navigation }: DeveloperScreenSettingsScreenProps) { text: t('reset'), onPress: async () => { await AsyncStorage.removeItem(REMOTE_CONFIG_OVERRIDES_KEY) - AsyncStorage.clear() + await AsyncStorage.clear() dispatch(logout()) }, },