Merge branch 'staging' into offline2

customize.dist/src/less2/include/messenger.less

@@ -55,12 +55,12 @@
         }
     }
 
-    .cp-app-contacts-spinner {
+    span.cp-app-contacts-spinner {
         display: none;
     }
 
     .cp-app-contacts-initializing {
-        .cp-app-contacts-spinner {
+        span.cp-app-contacts-spinner {
             color: @cp_messenger-fg;
             display: block;
         }

lib/workers/db-worker.js

@@ -348,10 +348,7 @@ const getOlderHistory = function (data, cb) {
         if (hash === oldestKnownHash) {
             found = true;
         }
-        messages.push({
+        messages.push(parsed);
-            msg: parsed,
-            hash: hash,
-        });
     }, function (err) {
         var toSend = [];
         if (typeof (desiredMessages) === "number") {
@@ -359,14 +356,14 @@ const getOlderHistory = function (data, cb) {
         } else if (untilHash) {
             for (var j = messages.length - 1; j >= 0; j--) {
                 toSend.unshift(messages[j]);
-                if (messages[j] && messages[j].hash === untilHash) {
+                if (Array.isArray(messages[j]) && HK.getHash(messages[j][4]) === untilHash) {
                     break;
                 }
             }
         } else {
             let cpCount = 0;
             for (var i = messages.length - 1; i >= 0; i--) {
-                if (/^cp\|/.test(messages[i].msg[4]) && i !== (messages.length - 1)) {
+                if (/^cp\|/.test(messages[i][4]) && i !== (messages.length - 1)) {
                     cpCount++;
                 }
                 toSend.unshift(messages[i]);