Update colors, icons, and fonts

js/background.js

@@ -102,7 +102,7 @@
 
   window.isActive = () => {
     const now = Date.now();
-    return now <= activeTimestamp + ACTIVE_TIMEOUT;
+    return window.isFocused() && now <= activeTimestamp + ACTIVE_TIMEOUT;
   };
   window.registerForActive = handler => activeHandlers.push(handler);
   window.unregisterForActive = handler => {
@@ -110,91 +110,16 @@
   };
 
   // Load these images now to ensure that they don't flicker on first use
-  const images = [];
+  window.preloadedImages = [];
   function preload(list) {
     for (let index = 0, max = list.length; index < max; index += 1) {
       const image = new Image();
       image.src = `./images/${list[index]}`;
-      images.push(image);
+      window.preloadedImages.push(image);
     }
   }
-  preload([
-    'alert-outline.svg',
-    'android.svg',
-    'apple.svg',
-    'appstore.svg',
-    'audio.svg',
-    'back.svg',
-    'chat-bubble-outline.svg',
-    'chat-bubble.svg',
-    'check-circle-outline.svg',
-    'check.svg',
-    'clock.svg',
-    'close-circle.svg',
-    'delete.svg',
-    'dots-horizontal.svg',
-    'double-check.svg',
-    'down.svg',
-    'download.svg',
-    'ellipsis.svg',
-    'error.svg',
-    'error_red.svg',
-    'file-gradient.svg',
-    'file.svg',
-    'folder-outline.svg',
-    'forward.svg',
-    'gear.svg',
-    'group_default.png',
-    'hourglass_empty.svg',
-    'hourglass_full.svg',
-    'icon_1024.png',
-    'icon_128.png',
-    'icon_16.png',
-    'icon_250.png',
-    'icon_256.png',
-    'icon_32.png',
-    'icon_48.png',
-    'image.svg',
-    'import.svg',
-    'lead-pencil.svg',
-    'menu.svg',
-    'microphone.svg',
-    'movie.svg',
-    'open_link.svg',
-    'paperclip.svg',
-    'play.svg',
-    'playstore.png',
-    'read.svg',
-    'reply.svg',
-    'save.svg',
-    'search.svg',
-    'sending.svg',
-    'shield.svg',
-    'signal-laptop.png',
-    'signal-phone.png',
-    'smile.svg',
-    'sync.svg',
-    'timer-00.svg',
-    'timer-05.svg',
-    'timer-10.svg',
-    'timer-15.svg',
-    'timer-20.svg',
-    'timer-25.svg',
-    'timer-30.svg',
-    'timer-35.svg',
-    'timer-40.svg',
-    'timer-45.svg',
-    'timer-50.svg',
-    'timer-55.svg',
-    'timer-60.svg',
-    'timer.svg',
-    'verified-check.svg',
-    'video.svg',
-    'voice.svg',
-    'warning.svg',
-    'x.svg',
-    'x_white.svg',
-  ]);
+  const builtInImages = await window.getBuiltInImages();
+  preload(builtInImages);
 
   // We add this to window here because the default Node context is erased at the end
   //   of preload.js processing

js/views/conversation_view.js

@@ -918,11 +918,29 @@
       });
 
       const onSave = caption => {
-        // eslint-disable-next-line no-param-reassign
-        attachment.caption = caption;
+        this.model.set({
+          draftAttachments: this.model.get('draftAttachments').map(item => {
+            if (
+              (item.path && item.path === attachment.path) ||
+              (item.screenshotPath &&
+                item.screenshotPath === attachment.screenshotPath)
+            ) {
+              return {
+                ...attachment,
+                caption,
+              };
+            }
+
+            return item;
+          }),
+          draftChanged: true,
+        });
+
         this.captionEditorView.remove();
         Signal.Backbone.Views.Lightbox.hide();
-        this.attachmentListView.update(this.getPropsForAttachmentList());
+
+        this.updateAttachmentsView();
+        this.saveModel();
       };
 
       this.captionEditorView = new Whisper.ReactWrapperView({
@@ -1041,7 +1059,7 @@
       }
 
       return {
-        ..._.pick(attachment, ['contentType', 'fileName', 'size']),
+        ..._.pick(attachment, ['contentType', 'fileName', 'size', 'caption']),
         data,
       };
     },
@@ -1253,7 +1271,7 @@
     async handleImageAttachment(file) {
       if (MIME.isJPEG(file.type)) {
         const rotatedDataUrl = await window.autoOrientImage(file);
-        const rotatedBlob = VisualAttachment.dataURLToBlobSync(rotatedDataUrl);
+        const rotatedBlob = window.dataURLToBlobSync(rotatedDataUrl);
         const {
           contentType,
           file: resizedBlob,
@@ -2107,7 +2125,7 @@
         className: 'contact-detail-pane panel',
         props: {
           contact,
-          signalAccount,
+          hasSignalAccount: Boolean(signalAccount),
           onSendMessage: () => {
             if (signalAccount) {
               this.openConversation(signalAccount);