Hey everyone, week 8 update.
The note lock configuration screen merged this week: Desktop: Resolves #15786: Add note lock configuration screen by keshav0479 · Pull Request #15852 · laurent22/joplin · GitHub. First visible piece of this project in the main app, behind the feature flag.
The big one followed it: the desktop lock UI is now open on the main repo, Desktop: Resolves #15872: Add note lock UI by keshav0479 · Pull Request #15961 · laurent22/joplin · GitHub. Same feature you saw on the fork last week, enable encryption from the right click menu, the padlock, the locked screen with the password form, now rebased on dev with all of mrjo's fork review folded in.
The mobile settings screen went up again too: Mobile: Resolves #15853: Add note lock configuration section by keshav0479 · Pull Request #15963 · laurent22/joplin · GitHub. It is rebuilt on the pattern from the merged desktop screen, and it came out less than half the size of the original, since the section and the auto lock setting now come from shared metadata. Smaller PR, same screen.
The export design in the proposal changed from what I wrote a few weeks ago: backups now keep locked notes encrypted and carry the encrypted key file with them, so a backup plus your password is always enough to recover, and imports can decrypt into your current key or skip and keep them locked.
Next is mobile locked note handling. It is already built and rebased, I am testing it properly before it goes up.
More next Friday 
More frequent updates are here: Local note encryption / Keshav