fix(settings): list stored custodial profiles in the account switcher even without an active custodial token

Author: esaugomez31

__tests__/screens/settings-screen/multi-account.spec.tsx

@@ -29,14 +29,15 @@ jest.mock("@app/utils/storage/secureStorage", () => ({
 }))
 
 const mockSaveProfile = jest.fn()
+let mockAppConfigToken = "mock-token-1"
 
 jest.mock("@app/hooks", () => ({
   useAppConfig: () => ({
     appConfig: {
       galoyInstance: {
         authUrl: "https://api.blink.sv",
       },
-      token: "mock-token-1",
+      token: mockAppConfigToken,
     },
   }),
   useSaveSessionProfile: () => ({
@@ -50,6 +51,8 @@ describe("Settings", () => {
   beforeEach(() => {
     loadLocale("en")
     LL = i18nObject("en")
+    mockAppConfigToken = "mock-token-1"
+    mockSaveProfile.mockClear()
   })
 
   it("Switch account shows user profiles", async () => {
@@ -71,4 +74,20 @@ describe("Settings", () => {
     expect(profiles).toEqual(expectedProfiles)
     expect(screen.getByTestId(LL.ProfileScreen.addAccount())).toBeTruthy()
   })
+
+  it("shows stored custodial profiles even with no current token (self-custodial active)", async () => {
+    mockAppConfigToken = ""
+    ;(KeyStoreWrapper.getSessionProfiles as jest.Mock).mockResolvedValue(expectedProfiles)
+
+    render(
+      <ContextForScreen>
+        <SwitchAccountComponent />
+      </ContextForScreen>,
+    )
+
+    await waitFor(() => {
+      expect(screen.getByText("TestUser")).toBeTruthy()
+    })
+    expect(mockSaveProfile).not.toHaveBeenCalled()
+  })
 })

app/screens/settings-screen/account/multi-account/switch-account.tsx

@@ -32,12 +32,11 @@ export const SwitchAccount: React.FC = () => {
   const [nextProfileToken, setNextProfileToken] = useState<string>()
 
   useEffect(() => {
-    if (!currentToken) return
     let isMounted = true
 
     const loadProfiles = async () => {
       let profilesList = await fetchProfiles(currentToken)
-      if (profilesList.length === 0) {
+      if (profilesList.length === 0 && currentToken) {
         await saveProfile(currentToken)
         profilesList = await fetchProfiles(currentToken)
       }