Merge pull request #141 from vezwork/fixUndefinedTimeSpentDetail

Fix favicon loading so it does not block data storage
esse-dev · Apr 25, 2021 · 26fea1a · 26fea1a
2 parents 4a836d6 + 3edf9ab
commit 26fea1a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/src/data/storage.js b/src/data/storage.js
@@ -107,7 +107,7 @@ async function updateAkitaData(originData, data, typeOfData, isMonetizedData) {
 			updateTimeSpent(originData, originStats, data, isMonetizedData);
 			break;
 		case AKITA_DATA_TYPE.ORIGIN_FAVICON: // Only for a monetized origin
-			await updateOriginFavicon(originData, data);
+			updateOriginFavicon(originData, data);
 			break;
 		default:
 			// console.log("invalid data type provided");

diff --git a/src/popup/popup.js b/src/popup/popup.js
@@ -384,25 +384,26 @@ function createTopSiteDetailEls(originData, originStats) {
 				textEl(`Crunching time spent numbers...`)
 			]);
 		}
+	} else {
+		setContentOfEl(timeSpentEl, [textEl(`Crunching time spent numbers...`)]);
 	}
 
-	// Set visit count text
-	let visitCountText = ``;
 	const visitCount = originData.originVisitData.numberOfVisits;
-	if (visitCount === 0) {
-		// Don't set the visit count text
-	} else if (visitCount === 1) {
-		visitCountText = `${visitCount} time`;
-	} else {
-		visitCountText = `${visitCount} times`;
-	}
+
+	// Set visit count text
 	let visitCountEl = paragraphEl();
-	if (visitCountText !== ``) {
+	if (visitCount > 0) {
 		const percentVisits = getPercentVisitsToOriginOutOfTotal(originData, originStats);
 		if (percentVisits > 0) {
+			let timeText;
+			if (visitCount > 1) {
+				timeText = `times`;
+			} else {
+				timeText = `time`;
+			}
 			setContentOfEl(visitCountEl, [
 				textEl(`You've visited `),
-				strongEl(visitCountText),
+				strongEl(`${visitCount} ${timeText}`),
 				textEl(`, which is `),
 				strongEl(`${percentVisits}%`),
 				textEl(` of your total website visits.`)
@@ -412,6 +413,10 @@ function createTopSiteDetailEls(originData, originStats) {
 				textEl(`Counting up visits...`)
 			]);
 		}
+	} else {
+		setContentOfEl(visitCountEl, [
+			textEl(`Counting up visits...`)
+		]);
 	}
 
 	// Set payment data text