The Conflicts notebook item in the mobile sidebar was recently updated with a new font color. In that spirit, I thought I would suggest other enhancements related to that notebook:
Remove the edit notebook and delete notebook buttons to delete the Conflicts notebook since they don't do anything.
Remove the add note button for the Conflicts notebook because it creates notes in the bugged ... notebook.
Place notes in any other notebook besides the bugged ... notebook when notes are added from the All notes notebook when the Conflicts notebook was the prior selected notebook.
Thank you for the quick turnaround. Please forgive me for adding more feature ideas for you or other developers to consider below:
Points 2 and 3 above work similarly to how notes restored from Trash whose original notebook no longer exists work. After testing the following cases from About the trash feature | Joplin:
When a note is restored, it is moved back to its original notebook. If the original notebook no longer exists, the note is moved instead to the root of the note collection. It means that to see it you will need to go to "All notes" at the top of the sidebar.
It looks like the ... notebook is just "the root of the note collection" or All notes. For better visibility, should notes restored from Trash whose original notebook no longer exists be moved into a Restored Notes notebook instead (similar to restored notes from Conflicts)?
As for your second PR: thoughts on keeping the dialog, removing the edit/delete buttons, and adding context for how the notebook works?
My reasoning is that it could prevent related support requests about how the notebook works or how long press seems broken.
Better copy for the Trash notebook than just "Notebook: Trash" could help too. In addition, the Keep notes in the trash for (90 days) value could also be presented.
All that said, I'm perfectly fine with how your fixes address the current Conflicts notebook issues.