TW-1504: [Mises] Temple ads native prompt (#1174)

* TW-1504: [Mises] Temple ads native prompt * TW-1504: [Mises] Temple ads native prompt. Refactor * TW-1504: [Mises] Temple ads native prompt. + === true check
madfish-solutions · Jul 29, 2024 · 42d1c94 · 42d1c94
1 parent 249afe0
commit 42d1c94
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 9 deletions.
diff --git a/src/app/storage/app-install-id.ts b/src/app/storage/app-install-id.ts
@@ -1,6 +1,6 @@
 import { fetchFromStorage, putToStorage } from 'lib/storage';
 
-const storageKey = 'APP_INSTALL_IDENTITY';
+export const APP_INSTALL_IDENTITY_STORAGE_KEY = 'APP_INSTALL_IDENTITY';
 
 interface AppInstallIdentity {
   version: string;
@@ -10,7 +10,7 @@ interface AppInstallIdentity {
   ts: string;
 }
 
-export const getStoredAppInstallIdentity = () => fetchFromStorage<AppInstallIdentity>(storageKey);
+export const getStoredAppInstallIdentity = () => fetchFromStorage<AppInstallIdentity>(APP_INSTALL_IDENTITY_STORAGE_KEY);
 
 export const putStoredAppInstallIdentity = (value: AppInstallIdentity) =>
-  putToStorage<AppInstallIdentity>(storageKey, value);
+  putToStorage<AppInstallIdentity>(APP_INSTALL_IDENTITY_STORAGE_KEY, value);
diff --git a/src/app/storage/mises-browser.ts b/src/app/storage/mises-browser.ts
@@ -0,0 +1,6 @@
+import { fetchFromStorage } from 'lib/storage';
+
+export const MISES_INSTALL_ENABLED_ADS_STORAGE_KEY = 'MISES_ACCEPT_TOS';
+
+export const getMisesInstallEnabledAds = () =>
+  fetchFromStorage<'true'>(MISES_INSTALL_ENABLED_ADS_STORAGE_KEY).then(r => r === 'true' || r === true);
diff --git a/src/lib/env.ts b/src/lib/env.ts
@@ -2,7 +2,11 @@ import PackageJSON from '../../package.json';
 
 export const APP_VERSION = PackageJSON.version;
 
-/** Only Mises browser among supported vendors counts as a mobile platform */
+/**
+ * Only Mises browser among supported vendors counts as a mobile platform
+ *
+ * `navigator.userAgentData.brands.find(b => b.brand === 'Mises')` will be available in future versions.
+ */
 // @ts-expect-error
 export const IS_MISES_BROWSER = Boolean(navigator.userAgentData?.mobile);
 

diff --git a/src/lib/temple/reset.ts b/src/lib/temple/reset.ts
@@ -1,4 +1,5 @@
-import { getStoredAppInstallIdentity, putStoredAppInstallIdentity } from 'app/storage/app-install-id';
+import { APP_INSTALL_IDENTITY_STORAGE_KEY } from 'app/storage/app-install-id';
+import { MISES_INSTALL_ENABLED_ADS_STORAGE_KEY } from 'app/storage/mises-browser';
 import { browser } from 'lib/browser';
 import * as Repo from 'lib/temple/repo';
 
@@ -10,9 +11,12 @@ export async function clearAllStorages() {
 export async function clearAsyncStorages() {
   await Repo.db.delete();
   await Repo.db.open();
-  const appIdentity = await getStoredAppInstallIdentity();
+  const keptRecord = await browser.storage.local.get([
+    APP_INSTALL_IDENTITY_STORAGE_KEY,
+    MISES_INSTALL_ENABLED_ADS_STORAGE_KEY
+  ]);
   await browser.storage.local.clear();
-  if (appIdentity) putStoredAppInstallIdentity(appIdentity);
+  await browser.storage.local.set(keptRecord);
   await browser.storage.session?.clear();
 }
 

diff --git a/src/replaceAds.ts b/src/replaceAds.ts
@@ -1,5 +1,6 @@
 import browser from 'webextension-polyfill';
 
+import { getMisesInstallEnabledAds } from 'app/storage/mises-browser';
 import { configureAds } from 'lib/ads/configure-ads';
 import { importExtensionAdsModule } from 'lib/ads/import-extension-ads-module';
 import {
@@ -8,7 +9,6 @@ import {
   WEBSITES_ANALYTICS_ENABLED,
   ADS_VIEWER_ADDRESS_STORAGE_KEY
 } from 'lib/constants';
-import { IS_MISES_BROWSER } from 'lib/env';
 import { fetchFromStorage } from 'lib/storage';
 
 import { getRulesFromContentScript, clearRulesCache } from './content-scripts/replace-ads';
@@ -60,5 +60,5 @@ async function checkIfShouldReplaceAds() {
 
   if (accountPkhFromStorage) return await fetchFromStorage<boolean>(WEBSITES_ANALYTICS_ENABLED);
 
-  return IS_MISES_BROWSER;
+  return await getMisesInstallEnabledAds();
 }