Merge pull request #1493 from Hirobreak/docid

using docid if exists

Author: javiteri95

electron_app/package.json

@@ -150,7 +150,7 @@
     "electron-notarize": "^0.1.1"
   },
   "dependencies": {
-    "@criptext/api": "^0.15.37",
+    "@criptext/api": "^0.17.0",
     "@criptext/data-transfer-client": "^0.1.1",
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",
     "@criptext/electron-push-receiver": "^2.1.3",

electron_app/src/utils/const.js

@@ -6,7 +6,7 @@ const {
   criptextInstallerType
 } = require('./../../package.json');
 
-const API_CLIENT_VERSION = '9.0.0';
+const API_CLIENT_VERSION = '11.0.0';
 const LINK_DEVICES_FILE_VERSION = '6';
 const PROD_SOCKET_URL = 'wss://socket.criptext.com';
 const PROD_SERVER_URL = 'https://api.criptext.com';

electron_app/yarn.lock

@@ -115,10 +115,10 @@
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
-"@criptext/api@^0.15.37":
-  version "0.15.37"
-  resolved "https://registry.yarnpkg.com/@criptext/api/-/api-0.15.37.tgz#9cfed4e381a80d57adb8bba56946a27490685449"
-  integrity sha512-kHR8vBdKYd+NCUxkLUURiJIyl2dwAj1/XR4OnWHd6aIrm3ZUUBp9WXHrFRD879NOvQPHUSBt5bbn5qU/PKZdfw==
+"@criptext/api@^0.17.0":
+  version "0.17.0"
+  resolved "https://registry.yarnpkg.com/@criptext/api/-/api-0.17.0.tgz#7bc102b7c2afd6d971ee3b51c27e20e145cb8c99"
+  integrity sha512-w7jxkzxlKqM371wyXrO8YUkgph8RhU5IxYdMmL9L0hx0tdbLAko8DHjHlub7yO2OmStEOUyk7k/RqBfEawlntA==
   dependencies:
     superagent "^3.8.2"
 

email_mailbox/src/utils/ApiUtils.js

@@ -10,7 +10,7 @@ import {
   resultString
 } from './AESUtils';
 
-const API_CLIENT_VERSION = '8.0.0';
+const API_CLIENT_VERSION = '11.0.0';
 const apiBaseUrl =
   !process.env.NODE_ENV || process.env.NODE_ENV === 'development'
     ? process.env.REACT_APP_DEV_API_URL

email_mailbox/src/utils/FetchUtils.js

@@ -57,7 +57,7 @@ const formEvents = events => {
       const data = {
         cmd: event.cmd,
         params: JSON.parse(event.params),
-        rowid: event.rowid
+        rowid: event.docid || event.rowid
       };
       eventsParsed.push(data);
     } catch (e) {}