Merge branch 'release-1.3' into dev

packages/app-desktop/gui/KeymapConfig/utils/getLabel.ts

@@ -30,9 +30,14 @@ const getLabel = (commandName: string):string => {
 		return _('Command palette');
 	case 'config':
 		return shim.isMac() ? _('Preferences') : _('Options');
-	default:
-		throw new Error(`Command: ${commandName} is unknown`);
 	}
+
+	// We don't throw an error if a command is not found because if for
+	// example a command is removed from one version to the next, or a
+	// command is renamed, we still want the keymap editor to work. So in
+	// that case, we simply display the command name and it is up to the
+	// user to fix the shortcut if needed.
+	return `${commandName} (${_('Invalid')})`;
 };
 
 export default getLabel;

packages/lib/components/shared/side-menu-shared.js

@@ -51,6 +51,13 @@ shared.renderFolders = function(props, renderItem) {
 shared.renderTags = function(props, renderItem) {
 	const tags = props.tags.slice();
 	tags.sort((a, b) => {
+		// It seems title can sometimes be undefined (perhaps when syncing
+		// and before tag has been decrypted?). It would be best to find
+		// the root cause but for now that will do.
+		//
+		// Fixes https://github.com/laurent22/joplin/issues/4051
+		if (!a || !a.title || !b || !b.title) return 0;
+
 		// Note: while newly created tags are normalized and lowercase
 		// imported tags might be any case, so we need to do case-insensitive
 		// sort.