Merge pull request #1379 from Hirobreak/feed-error

fixing feeditem and label error

Author: danieltigse

electron_app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "criptext",
-  "version": "0.27.2",
+  "version": "0.27.3",
   "author": {
     "name": "Criptext Inc",
     "email": "[email protected]",

electron_app/src/database/DBEmanager.js

@@ -951,7 +951,9 @@ const createLabel = async params => {
     labelsToInsert = Object.assign(params, { uuid: genUUID() });
   }
   labelsToInsert = params;
-  return Label().create(labelsToInsert);
+  return Label()
+    .create(labelsToInsert)
+    .then(label => label.toJSON());
 };
 
 const createSystemLabels = () => {

electron_app/src/database/DBEmodel.js

@@ -87,7 +87,8 @@ const setConfiguration = key => {
     dialect: 'sqlite',
     dialectModulePath: '@journeyapps/sqlcipher',
     storage: myDBEncryptPath(),
-    logging: false
+    logging: false,
+    transactionType: 'IMMEDIATE'
   });
 };
 

electron_app/src/windows/pin.js

@@ -169,11 +169,6 @@ const checkPin = async () => {
 };
 
 const validatePin = async pinToValidate => {
-  const credentials = await checkPin();
-  if (credentials) {
-    return pinToValidate === credentials;
-  }
-
   try {
     await initDatabaseEncrypted({
       key: pinToValidate,

email_composer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "email_composer",
-  "version": "0.27.2",
+  "version": "0.27.3",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",

email_loading/package.json

@@ -1,6 +1,6 @@
 {
   "name": "email_loading",
-  "version": "0.27.2",
+  "version": "0.27.3",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",

email_login/package.json

@@ -1,6 +1,6 @@
 {
   "name": "email_login",
-  "version": "0.27.2",
+  "version": "0.27.3",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",

email_mailbox/package.json

@@ -1,6 +1,6 @@
 {
   "name": "email_mailbox",
-  "version": "0.27.2",
+  "version": "0.27.3",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",

email_mailbox/src/containers/ActivityPanel.js

@@ -23,7 +23,7 @@ const mapStateToProps = state => {
     .map(feedItem => feedItem.id);
   return {
     newFeeds: newFeedsPlain.filter(item => item.emailData),
-    oldFeeds: oldFeeds.toJS(),
+    oldFeeds: oldFeeds.toJS().filter(item => item.emailData),
     feedItemIds
   };
 };

email_pin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "email_pin",
-  "version": "0.27.2",
+  "version": "0.27.3",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",