[native] Dispatch UserKeys creation success in useRestoreProtocol
ClosedPublic
Actions

Authored by bartek on Jul 3 2025, 7:12 AM.

Details

Reviewers

kamil

Commits

rCOMM70c118283a56: [native] Dispatch UserKeys creation success in useRestoreProtocol

Summary

When restoring primary device, we create a new UserKeys backup, but don't store it in Redux. This caused UserKeys backup to be created twice - once here in useRestoreProtocol, and the second time triggered by BackupHandler because latestBackupInfo wasn't set for the first backup. Also, for full backup, the second UserKeys creation interfered with UserData backup creation.
Updating Redux after first backup is created solves the issue.

Depends on D14882

Test Plan

Ran restoration with extended logging, confirmed that BackupHandler no longer triggers UserKeys backup after restoration. Confirmed that backupStore contains backupID from useRestoreProtocol.

Diff Detail

Repository

rCOMM Comm

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

bartek created this revision.Jul 3 2025, 7:12 AM

bartek held this revision as a draft.

Herald added subscribers: tomek, ashoat. · View Herald TranscriptJul 3 2025, 7:12 AM

bartek added a child revision: D14884: [lib] Handle existing backup actions in restoreBackupState reducer.Jul 3 2025, 7:17 AM

Harbormaster completed remote builds in B34480: Diff 48610.Jul 3 2025, 7:49 AM

bartek published this revision for review.Jul 3 2025, 8:49 AM

kamil accepted this revision.Jul 8 2025, 9:41 AM

kamil added inline comments.

native/account/restore.js
157–163 ↗	(On Diff #48610)	This seems a bit messy, `useRestoreProtocol` is used in only one place, in `useRestore`, which then passes the promise from this hook to `dispatchActionPromise` with `restoreUserActionTypes`. I would suggest updating `restoreUserActionTypes` payload (this should work smoothly with previous D14883), and handling this on `restoreUserActionTypes.success` action. With this, we avoid two antipatterns: Dispatching `.success` action outside of `dispatchActionPromise` Having `dispatchActionPromise` causing another `dispatch` inside. However, if this is much more work - the solution here is also fine, so accepting in advance

This revision is now accepted and ready to land.Jul 8 2025, 9:41 AM

kamil mentioned this in D14884: [lib] Handle existing backup actions in restoreBackupState reducer.Jul 8 2025, 9:47 AM

bartek added inline comments.Jul 8 2025, 2:24 PM

native/account/restore.js
157–163 ↗	(On Diff #48610)	This is a really valid point. I've updated the code to reflect your suggestions. It's much better now, thank you.

Renamed useRestoreProtocol return type to RestoreProtocolResult, to avoid naming ambiguity with the other RestoreUserResult which is returned by the Identity RPC call.
Added latestBackupInfo to the type
Used the extended type and the fact that it's returned in dispatchActionPromise to update BackupStore, instead of dispatching a separate action just to update this store.