Merge pull request #1427 from Hirobreak/delete-draft

danieltigse · web-flow · commit a9b8813d52a4 · 2020-04-16T11:14:46.000-05:00
draft create with key as string
diff --git a/electron_app/package.json b/electron_app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "criptext",
-  "version": "0.28.2",
+  "version": "0.28.3",
   "author": {
     "name": "Criptext Inc",
     "email": "support@criptext.com",
diff --git a/electron_app/src/database/DBEmanager.js b/electron_app/src/database/DBEmanager.js
@@ -397,14 +397,12 @@ const createEmail = (params, prevTrx) => {
 };
 
 const getKeys = (keys, accountId, trx) => {
-  return Email()
-    .findAll({
-      attributes: ['id'],
-      where: { key: keys, accountId },
-      raw: true,
-      transaction: trx
-    })
-    .then(list => list);
+  return Email().findAll({
+    attributes: ['id'],
+    where: { key: keys, accountId },
+    raw: true,
+    transaction: trx
+  });
 };
 
 const deleteEmailByKeys = async ({ accountId, keys }) => {
diff --git a/email_composer/package.json b/email_composer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "email_composer",
-  "version": "0.28.2",
+  "version": "0.28.3",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",
diff --git a/email_composer/src/utils/EmailUtils.js b/email_composer/src/utils/EmailUtils.js
@@ -120,7 +120,7 @@ export const formOutgoingEmailFromData = ({
     ? myAccount.recipientId
     : `${myAccount.recipientId}@${appDomain}`;
   const email = {
-    key: Date.now(),
+    key: parseInt(Date.now()).toString(),
     subject: textSubject,
     preview: cleanHTML(body).slice(0, previewLength),
     date: Date.now(),
diff --git a/email_loading/package.json b/email_loading/package.json
@@ -1,6 +1,6 @@
 {
   "name": "email_loading",
-  "version": "0.28.2",
+  "version": "0.28.3",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",
diff --git a/email_login/package.json b/email_login/package.json
@@ -1,6 +1,6 @@
 {
   "name": "email_login",
-  "version": "0.28.2",
+  "version": "0.28.3",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",
diff --git a/email_mailbox/package.json b/email_mailbox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "email_mailbox",
-  "version": "0.28.2",
+  "version": "0.28.3",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",
diff --git a/email_mailbox/src/components/sidebaritem.scss b/email_mailbox/src/components/sidebaritem.scss
@@ -143,9 +143,15 @@
           color: $_COLOR_ICON_NAVITEM_SELECTED;
         }
   
-        span{
+        >span {
           color: $_COLOR_TEXT_NAVITEM_SELECTED;
         }
+
+        a {
+          span{
+            color: $_COLOR_TEXT_NAVITEM_SELECTED;
+          }
+        } 
       }
       
       &:hover{
@@ -156,9 +162,15 @@
         color: $_COLOR_ICON_NAVITEM;
       }
 
-      span{
+      >span{
         color: $_COLOR_TEXT_NAVITEM;
       }
+
+      a {
+        span{
+          color: $_COLOR_TEXT_NAVITEM;
+        }
+      }
     }
   }
 }
diff --git a/email_pin/package.json b/email_pin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "email_pin",
-  "version": "0.28.2",
+  "version": "0.28.3",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "criptext",`
`3`		`- "version": "0.28.2",`
	`3`	`+ "version": "0.28.3",`
`4`	`4`	`"author": {`
`5`	`5`	`"name": "Criptext Inc",`
`6`	`6`	`"email": "[email protected]",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "email_composer",`
`3`		`- "version": "0.28.2",`
	`3`	`+ "version": "0.28.3",`
`4`	`4`	`"private": true,`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "email_loading",`
`3`		`- "version": "0.28.2",`
	`3`	`+ "version": "0.28.3",`
`4`	`4`	`"private": true,`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "email_login",`
`3`		`- "version": "0.28.2",`
	`3`	`+ "version": "0.28.3",`
`4`	`4`	`"private": true,`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "email_mailbox",`
`3`		`- "version": "0.28.2",`
	`3`	`+ "version": "0.28.3",`
`4`	`4`	`"private": true,`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",`
Original file line number	Diff line number	Diff line change
`@@ -143,9 +143,15 @@`
`143`	`143`	`color: $_COLOR_ICON_NAVITEM_SELECTED;`
`144`	`144`	`}`
`145`	`145`
`146`		`- span{`
	`146`	`+ >span {`
`147`	`147`	`color: $_COLOR_TEXT_NAVITEM_SELECTED;`
`148`	`148`	`}`
	`149`	`+`
	`150`	`+ a {`
	`151`	`+ span{`
	`152`	`+ color: $_COLOR_TEXT_NAVITEM_SELECTED;`
	`153`	`+ }`
	`154`	`+ }`
`149`	`155`	`}`
`150`	`156`
`151`	`157`	`&:hover{`
`@@ -156,9 +162,15 @@`
`156`	`162`	`color: $_COLOR_ICON_NAVITEM;`
`157`	`163`	`}`
`158`	`164`
`159`		`- span{`
	`165`	`+ >span{`
`160`	`166`	`color: $_COLOR_TEXT_NAVITEM;`
`161`	`167`	`}`
	`168`	`+`
	`169`	`+ a {`
	`170`	`+ span{`
	`171`	`+ color: $_COLOR_TEXT_NAVITEM;`
	`172`	`+ }`
	`173`	`+ }`
`162`	`174`	`}`
`163`	`175`	`}`
`164`	`176`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "email_pin",`
`3`		`- "version": "0.28.2",`
	`3`	`+ "version": "0.28.3",`
`4`	`4`	`"private": true,`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",`