Thanks for making this a clean refactor diff!

Only looked at .proto changes

Sorry, this should have been explained in the diff. The main reason we're doing it this way are the issues in ENG-3252. Many of us (myself included) are currently unable to use the avatars feature because the request consistently times out when we open the app

https://phab.comm.dev/D7218?id=24775#inline-48333

Change seems right though

Test plan before / after seems identical? Maybe I'm missing something

I think this was intentional, but I forget why

Looks good!! Just a couple comments

Sorry

Nothing major here, but enough comments that I figured it would be good to do another cycle of review

Same feedback as in D7628:

I can't tell for sure, but it looks like you're moving and updating code in the same diff

https://www.notion.so/commapp/Moving-code-around-bbb551c4350b4d5cb553c6751be44314

We appear to use another version in other package.json files (3.3.3), but in yarn.lock it resolves to the same version:

(Removing most reviewers to clear out their queues, feel free to re-add yourself if you're interested)

In D7570#226344, @marcin wrote:

I implemented temporary solution to prekey rotation in D7586. It is done only to the notifications prekey, however notifications prekey is the only prekey that is currently used and exchanged with clients, so by not marking primary prekey as published we are not running into security issues. So we can either leave it as it is or exclude primary prekey validation from the cron until primary prekey leaves keyserver ecosystem for the first time. I would prefer the first option.

It would be good to explain the reason for the changes here. Are these changes being made because you're going to reuse the factored-out code in a later diff in the stack, so it makes sense to factor out the shared logic here?

Looks great!

Removing some reviewers to avoid polluting their queues

In my personal opinion there are too many reviewers here. If any of you want to be included in the review, feel free to re-add yourself... just figured it would be good to clear out your queue

We still have a problem here which is that we won't be doing any prekey rotation, since it appears that the rotation only happens if the prekey is marked as published. You can either mark the prekey as published here, and @jon will "undo" that once he is actually publishing the prekeys. Or we can change the conditions for the rotation to not look at whether the prekey has been published. Also open to other ideas, but prekey rotation is a must-have here

Thanks!!

Please address inline comment before landing

Small fixes

I was seeing an issue where the SafeAreaView was applying the bottom inset when the KeyboardAvoidingView was up. To address this, I moved the SafeAreaView upstream to RegistrationNavigator, and moved KeyboardAvoidingView downstream to RegistrationContainer

As of my most recent updates to D7593, the RegistrationContainer now handles scrolling, so we now need to wrap it with a container View.

Rebase

Had to move the KeyboardAvoidingView into the RegistrationContainer so that:

Address inline comment before landing

https://www.notion.so/commapp/Moving-code-around-bbb551c4350b4d5cb553c6751be44314

Mainly concerned about codeVersion check