Handle different decryption errors

src/renderer/components/views/PasswordPrompt/PasswordPrompt.js

@@ -6,6 +6,7 @@ import PageCentered from '../PageCentered';
 
 
 const propTypes = {
+	decryptErrorMsg: PropTypes.string.isRequired,
 	decryptFile: PropTypes.func.isRequired,
 	decryptStatus: PropTypes.string.isRequired
 };
@@ -53,7 +54,7 @@ export default class PasswordPrompt extends PureComponent {
 	}
 
 	render() {
-		const { decryptStatus } = this.props;
+		const { decryptErrorMsg, decryptStatus } = this.props;
 		const { isSubmitted, password } = this.state;
 
 		return (
@@ -77,7 +78,7 @@ export default class PasswordPrompt extends PureComponent {
 				<div className="password-prompt-banner">
 					{
 						isSubmitted && decryptStatus === 'error'
-							&& <Banner type="error" message="Incorrect password" />
+							&& <Banner type="error" message={decryptErrorMsg} />
 					}
 				</div>
 			</PageCentered>

src/renderer/components/views/PasswordPrompt/PasswordPromptContainer.js

@@ -6,6 +6,7 @@ import { decryptFile } from '../../../redux/actions/fileActions';
 
 function mapStateToProps(state) {
 	return {
+		decryptErrorMsg: state.file.decryptErrorMsg,
 		decryptStatus: state.file.decryptStatus
 	};
 }

src/renderer/redux/actions/fileActions.js

@@ -20,9 +20,12 @@ function setDecryptInProgress() {
 	};
 }
 
-function setDecryptError() {
+function setDecryptError(decryptErrorMsg) {
 	return {
-		type: 'DECRYPT_ERROR'
+		type: 'DECRYPT_ERROR',
+		payload: {
+			decryptErrorMsg
+		}
 	};
 }
 
@@ -122,11 +125,13 @@ export function decryptFile(password) {
 			enableMenuItems();
 		} catch (err) {
 			// Error reading diary file
-			if (!err.message.endsWith('bad decrypt')) {
-				// Other error (not incorrect password error)
-				console.error(err);
+			let errorMsg;
+			if (err.message.endsWith('bad decrypt')) {
+				errorMsg = 'Incorrect password';
+			} else {
+				errorMsg = 'Error while decrypting diary file';
 			}
-			dispatch(setDecryptError());
+			dispatch(setDecryptError(errorMsg));
 		}
 	};
 }

src/renderer/redux/reducers/fileReducer.js

@@ -1,4 +1,5 @@
 function file(state = {
+	decryptErrorMsg: '',
 	decryptStatus: 'idle', // One of ['idle', 'inProgress', 'error']
 	encryptStatus: 'idle', // One of ['idle', 'inProgress', 'error']
 	entries: {},
@@ -9,18 +10,21 @@ function file(state = {
 		case 'DECRYPT_IN_PROGRESS': {
 			return {
 				...state,
+				decryptErrorMsg: '',
 				decryptStatus: 'inProgress'
 			};
 		}
 		case 'DECRYPT_ERROR': {
 			return {
 				...state,
+				decryptErrorMsg: action.payload.decryptErrorMsg,
 				decryptStatus: 'error'
 			};
 		}
 		case 'DECRYPT_SUCCESS': {
 			return {
 				...state,
+				decryptErrorMsg: '',
 				decryptStatus: 'idle',
 				entries: action.payload.entries
 			};