Fix blank avatars, duplicate recent media, static message details

js/views/react_wrapper_view.js

@@ -39,11 +39,11 @@
 
       this.hasRendered = false;
     },
-    update(props, cb) {
+    update(propsOrJSX, cb) {
-      const updatedProps = this.augmentProps(props);
       const reactElement = this.JSX
-        ? this.JSX
+        ? propsOrJSX || this.JSX
-        : React.createElement(this.Component, updatedProps);
+        : React.createElement(this.Component, this.augmentProps(propsOrJSX));
+
       ReactDOM.render(reactElement, this.el, () => {
         if (cb) {
           try {

ts/components/AvatarPreview.tsx

@@ -119,9 +119,14 @@ export const AvatarPreview = ({
   }, [avatarPreview]);
 
   let imageStatus: ImageStatus;
+  let encodedPath: string | undefined;
   if (avatarValue && !objectUrl) {
     imageStatus = ImageStatus.Loading;
-  } else if (objectUrl || avatarPath) {
+  } else if (objectUrl) {
+    encodedPath = objectUrl;
+    imageStatus = ImageStatus.HasImage;
+  } else if (avatarPath) {
+    encodedPath = encodeURI(avatarPath);
     imageStatus = ImageStatus.HasImage;
   } else {
     imageStatus = ImageStatus.Nothing;
@@ -164,10 +169,10 @@ export const AvatarPreview = ({
         className={`AvatarPreview__avatar AvatarPreview__avatar--${imageStatus}`}
         {...clickProps}
         style={
-          imageStatus === ImageStatus.HasImage
+          imageStatus === ImageStatus.HasImage && encodedPath
             ? {
                 ...componentStyle,
-                backgroundImage: `url('${objectUrl || avatarPath}')`,
+                backgroundImage: `url('${encodedPath}')`,
               }
             : componentStyle
         }

ts/views/conversation_view.ts

@@ -2015,7 +2015,11 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
     return true;
   }
 
-  async showAllMedia(): Promise<void> {
+  showAllMedia(): void {
+    if (this.panels && this.panels.length) {
+      return;
+    }
+
     // We fetch more documents than media as they don’t require to be loaded
     // into memory right away. Revisit this once we have infinite scrolling:
     const DEFAULT_MEDIA_FETCH_COUNT = 50;
@@ -2174,20 +2178,6 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
       };
     };
 
-    const view = new Whisper.ReactWrapperView({
-      className: 'panel',
-      Component: window.Signal.Components.MediaGallery,
-      props: await getProps(),
-      onClose: () => {
-        unsubscribe();
-      },
-    });
-    view.headerTitle = window.i18n('allMedia');
-
-    const update = async () => {
-      view.update(await getProps());
-    };
-
     function getMessageIds(): Array<string | undefined> | undefined {
       const state = window.reduxStore.getState();
       const byConversation = state?.conversations?.messagesByConversation;
@@ -2211,7 +2201,22 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
       }
     });
 
+    const view = new Whisper.ReactWrapperView({
+      className: 'panel',
+      Component: window.Signal.Components.MediaGallery,
+      onClose: () => {
+        unsubscribe();
+      },
+    });
+    view.headerTitle = window.i18n('allMedia');
+
+    const update = async () => {
+      view.update(await getProps());
+    };
+
     this.listenBack(view);
+
+    update();
   }
 
   focusMessageField(): void {
@@ -2835,7 +2840,13 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
       onClose,
     });
 
-    const update = () => view.update(getProps());
+    const update = () =>
+      view.update(
+        window.Signal.State.Roots.createMessageDetail(
+          window.reduxStore,
+          getProps()
+        )
+      );
     this.listenTo(message, 'change', update);
     this.listenTo(message, 'expired', onClose);
     // We could listen to all involved contacts, but we'll call that overkill