From d7ab9cbd9a06fb871e38575fd5ebc4e567f6fbd7 Mon Sep 17 00:00:00 2001
From: shubhsherl <shubham.singh094@yahoo.com>
Date: Sat, 23 May 2020 12:57:24 +0530
Subject: [PATCH 1/2] cache user avatar without url params

---
 public/sw.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/public/sw.js b/public/sw.js
index d4641e7c91c2..a1d4ee5c13e3 100644
--- a/public/sw.js
+++ b/public/sw.js
@@ -15,6 +15,12 @@ function hasSameHash(firstUrl, secondUrl) {
 	}
 }
 
+function handleAvatar(request, response) {
+	const clonedResponse = response.clone();
+	const url = request.url.split('?')[0];
+	caches.open(version).then((cache) => cache.put(new Request(url), clonedResponse));
+}
+
 const fetchFromNetwork = (event) => {
 	const requestToFetch = event.request.clone();
 	return fetch(requestToFetch, { cache: 'reload' }).then((response) => {
@@ -37,6 +43,12 @@ const fetchFromNetwork = (event) => {
 					}
 				})));
 			}
+
+			if (/avatar\/.*\?_dc/.test(event.request.url)) {
+				// handle the avatar updates
+				handleAvatar(event.request, response);
+			}
+
 			caches.open(version).then((cache) => cache.put(event.request, clonedResponse));
 		}
 		return response;

From 6f4ffd01c0ad26d519babefaae384dd966858906 Mon Sep 17 00:00:00 2001
From: shubhsherl <shubham.singh094@yahoo.com>
Date: Thu, 28 May 2020 12:58:08 +0530
Subject: [PATCH 2/2] force reload of avatar on sidenav header

---
 app/ui-utils/client/lib/avatar.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/ui-utils/client/lib/avatar.js b/app/ui-utils/client/lib/avatar.js
index 4d026179ee86..7068a0d14a6e 100644
--- a/app/ui-utils/client/lib/avatar.js
+++ b/app/ui-utils/client/lib/avatar.js
@@ -39,5 +39,8 @@ export const updateAvatarOfUsername = function(username) {
 	$(`.sidebar-item.js-sidebar-type-d .sidebar-item__link[aria-label='${ username }'] .avatar-image`)
 		.attr('src', url);
 
+	// force reload of avatar on sidenav header
+	$(`.sidebar__header .sidebar__header-thumb .avatar-image[alt='${ username }']`).attr('src', url);
+
 	return true;
 };