Merge pull request matrix-org#5422 from matrix-org/t3chguy/fix/_940

t3chguy · web-flow · commit 447e87ceab87 · 2020-11-13T00:29:26.000Z
Fix BaseAvatar sometimes messing up and duplicating the url
diff --git a/src/components/views/avatars/BaseAvatar.tsx b/src/components/views/avatars/BaseAvatar.tsx
@@ -51,7 +51,8 @@ const calculateUrls = (url, urls) => {
         _urls = urls || [];
 
         if (url) {
-            _urls.unshift(url); // put in urls[0]
+            // copy urls and put url first
+            _urls = [url, ..._urls];
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,8 @@ const calculateUrls = (url, urls) => {`
`51`	`51`	`_urls = urls \|\| [];`
`52`	`52`
`53`	`53`	`if (url) {`
`54`		`- _urls.unshift(url); // put in urls[0]`
	`54`	`+ // copy urls and put url first`
	`55`	`+ _urls = [url, ..._urls];`
`55`	`56`	`}`
`56`	`57`	`}`
`57`	`58`