From 144f5fb8e4c9f91ff0e0b173bbd347103169d6bf Mon Sep 17 00:00:00 2001
From: Jannis Mattheis <contact@jmattheis.de>
Date: Sat, 16 Mar 2019 18:18:41 +0100
Subject: [PATCH] Prevent 'still loading' image requests

---
 ui/src/message/Message.tsx      | 16 +++++++++-------
 ui/src/message/MessagesStore.ts |  4 ++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/ui/src/message/Message.tsx b/ui/src/message/Message.tsx
index 7362f02..0215ade 100644
--- a/ui/src/message/Message.tsx
+++ b/ui/src/message/Message.tsx
@@ -57,13 +57,15 @@ class Message extends React.PureComponent<IProps & WithStyles<typeof styles>> {
             <div className={`${classes.wrapperPadding} message`} ref={(ref) => (this.node = ref)}>
                 <Container style={{display: 'flex'}}>
                     <div className={classes.imageWrapper}>
-                        <img
-                            src={config.get('url') + image}
-                            alt="app logo"
-                            width="70"
-                            height="70"
-                            className={classes.image}
-                        />
+                        {image !== null ? (
+                            <img
+                                src={config.get('url') + image}
+                                alt="app logo"
+                                width="70"
+                                height="70"
+                                className={classes.image}
+                            />
+                        ) : null}
                     </div>
                     <div className={classes.messageContentWrapper}>
                         <div className={classes.header}>
diff --git a/ui/src/message/MessagesStore.ts b/ui/src/message/MessagesStore.ts
index ec9e5ee..ffc3023 100644
--- a/ui/src/message/MessagesStore.ts
+++ b/ui/src/message/MessagesStore.ts
@@ -127,7 +127,7 @@ export class MessagesStore {
         }
     };
 
-    private getUnCached = (appId: number): Array<IMessage & {image: string}> => {
+    private getUnCached = (appId: number): Array<IMessage & {image: string | null}> => {
         const appToImage = this.appStore
             .getItems()
             .reduce((all, app) => ({...all, [app.id]: app.image}), {});
@@ -135,7 +135,7 @@ export class MessagesStore {
         return this.stateOf(appId, false).messages.map((message: IMessage) => {
             return {
                 ...message,
-                image: appToImage[message.appid] || 'still loading',
+                image: appToImage[message.appid] || null,
             };
         });
     };