based on ppk branch

packages/app-desktop/gui/EncryptionConfigScreen.tsx

@@ -253,7 +253,7 @@ class EncryptionConfigScreenComponent extends React.Component<Props> {
 		// 		</div>
 		// 	);
 		// } else {
-			
+
 
 		// 	return (
 		// 		<div style={{ display: 'flex', flexDirection: 'column' }}>
@@ -382,7 +382,7 @@ class EncryptionConfigScreenComponent extends React.Component<Props> {
 					<h1 style={theme.h1Style}>{_('End-to-end encryption')}</h1>
 					<p style={theme.textStyle}>
 						{_('Encryption is:')} <strong>{this.props.encryptionEnabled ? _('Enabled') : _('Disabled')}</strong>
-					</p>					
+					</p>
 					{decryptedItemsInfo}
 					{toggleButton}
 					{needUpgradeSection}

packages/lib/commands/openMasterPasswordDialog.ts

@@ -9,7 +9,7 @@ export const declaration: CommandDeclaration = {
 
 export const runtime = (): CommandRuntime => {
 	return {
-		execute: async (context: CommandContext, isOpen:boolean = true) => {
+		execute: async (context: CommandContext, isOpen: boolean = true) => {
 			context.dispatch({
 				type: 'DIALOG_OPEN',
 				name: 'masterPassword',

packages/lib/services/database/types.ts

@@ -18,8 +18,6 @@ export interface BaseItemEntity {
 
 
 
-
-
 // AUTO-GENERATED BY packages/tools/generate-database-types.js
 
 /*
@@ -52,7 +50,6 @@ export interface FolderEntity {
   "parent_id"?: string 
   "is_shared"?: number 
   "share_id"?: string 
-  "master_key_id"?: string 
   "type_"?: number 
 }
 export interface ItemChangeEntity {
@@ -129,7 +126,6 @@ export interface NoteEntity {
   "is_shared"?: number 
   "share_id"?: string 
   "conflict_original_id"?: string 
-  "master_key_id"?: string 
   "type_"?: number 
 }
 export interface NotesNormalizedEntity {