chore: remove icon transition, closes #4332

leather-io · Oct 30, 2023 · b75b20a · b75b20a
1 parent e8fa72f
commit b75b20a
Show file tree

Hide file tree

Showing 18 changed files with 7 additions and 32 deletions.
diff --git a/public/assets/connect-logo/Stacks128w-dev.png b/public/assets/connect-logo/Stacks128w-dev.png
diff --git a/public/assets/connect-logo/Stacks128w-preview.png b/public/assets/connect-logo/Stacks128w-preview.png
diff --git a/public/assets/connect-logo/Stacks128w.png b/public/assets/connect-logo/Stacks128w.png
diff --git a/public/assets/connect-logo/Stacks256w-dev.png b/public/assets/connect-logo/Stacks256w-dev.png
diff --git a/public/assets/connect-logo/Stacks256w-preview.png b/public/assets/connect-logo/Stacks256w-preview.png
diff --git a/public/assets/connect-logo/Stacks256w.png b/public/assets/connect-logo/Stacks256w.png
diff --git a/public/assets/connect-logo/Stacks512w-dev.png b/public/assets/connect-logo/Stacks512w-dev.png
diff --git a/public/assets/connect-logo/Stacks512w-preview.png b/public/assets/connect-logo/Stacks512w-preview.png
diff --git a/public/assets/connect-logo/Stacks512w.png b/public/assets/connect-logo/Stacks512w.png
diff --git a/public/assets/icons/leather-icon-256.png b/public/assets/icons/leather-icon-256.png
diff --git a/public/assets/icons/leather-icon-512-dev.png b/public/assets/icons/leather-icon-512-dev.png
diff --git a/public/assets/icons/leather-icon-512.png b/public/assets/icons/leather-icon-512.png
diff --git a/scripts/generate-manifest.js b/scripts/generate-manifest.js
@@ -15,9 +15,9 @@ const TARGET_BROWSER = process.env.TARGET_BROWSER ?? 'chromium';
 
 function generateImageAssetUrlsWithSuffix(suffix = '') {
   return {
-    128: `assets/connect-logo/Stacks128w${suffix}.png`,
-    256: `assets/connect-logo/Stacks256w${suffix}.png`,
-    512: `assets/connect-logo/Stacks512w${suffix}.png`,
+    128: `assets/icons/leather-icon-128${suffix}.png`,
+    256: `assets/icons/leather-icon-256${suffix}.png`,
+    512: `assets/icons/leather-icon-512${suffix}.png`,
   };
 }
 
@@ -37,8 +37,8 @@ const contentSecurityPolicyEnvironment = {
 };
 
 const defaultIconEnvironment = {
-  development: 'assets/connect-logo/Stacks128w-dev.png',
-  production: 'assets/connect-logo/Stacks128w.png',
+  development: 'assets/icons/leather-icon-128-dev.png',
+  production: 'assets/icons/leather-icon-128.png',
 };
 
 const browserSpecificConfig = {

diff --git a/src/app/features/html-head/head-provider.tsx b/src/app/features/html-head/head-provider.tsx
@@ -25,7 +25,7 @@ function HiroMetaTags() {
   return (
     <>
       <Title>Hiro Wallet</Title>
-      <Link rel="icon" href="/assets/connect-logo/Stacks128w.png" />
+      <Link rel="icon" href="/assets/icons/leather-icon-128.png" />
     </>
   );
 }
diff --git a/src/app/features/leather-intro-dialog/leather-intro-dialog.tsx b/src/app/features/leather-intro-dialog/leather-intro-dialog.tsx
@@ -1,8 +1,6 @@
 import { createContext, useContext } from 'react';
 import { Outlet, Route, useNavigate } from 'react-router-dom';
 
-import { setNewAppIcon } from '@shared/new-theme/update-app-icon';
-
 import { useAnalytics } from '@app/common/hooks/analytics/use-analytics';
 import { delay } from '@app/common/utils';
 import { openInNewTab } from '@app/common/utils/open-in-new-tab';
@@ -51,7 +49,6 @@ function LeatherIntroDialogContainer() {
   async function onAcceptTerms() {
     void analytics.track('new_brand_accept_terms');
     dispatch(settingsActions.setHasApprovedNewBrand());
-    await setNewAppIcon();
     navigate('../', { replace: true });
   }
 

diff --git a/src/background/background.ts b/src/background/background.ts
@@ -4,7 +4,6 @@
 import { logger } from '@shared/logger';
 import { CONTENT_SCRIPT_PORT } from '@shared/message-types';
 import type { LegacyMessageFromContentScript } from '@shared/message-types';
-import { setNewAppIcon, userHasApprovedAppIcon } from '@shared/new-theme/update-app-icon';
 import { RouteUrls } from '@shared/route-urls';
 import { WalletRequests } from '@shared/rpc/rpc-methods';
 import { warnUsersAboutDevToolsDangers } from '@shared/utils/dev-tools-warning-log';
@@ -22,17 +21,12 @@ warnUsersAboutDevToolsDangers();
 
 chrome.runtime.onInstalled.addListener(async details => {
   if (details.reason === 'install' && process.env.WALLET_ENVIRONMENT !== 'testing') {
-    await setNewAppIcon();
     await chrome.tabs.create({
       url: chrome.runtime.getURL(`index.html#${RouteUrls.RequestDiagnostics}`),
     });
   }
 });
 
-chrome.runtime.onStartup.addListener(async () => {
-  if (await userHasApprovedAppIcon()) await setNewAppIcon();
-});
-
 // Listen for connection to the content-script - port for two-way communication
 chrome.runtime.onConnect.addListener(port => {
   if (port.name !== CONTENT_SCRIPT_PORT) return;

diff --git a/src/shared/new-theme/update-app-icon.ts b/src/shared/new-theme/update-app-icon.ts
diff --git a/test-app/public/html/index.html b/test-app/public/html/index.html
@@ -1,10 +1,9 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
   <head>
     <meta charset="UTF-8" />
     <title><%= htmlWebpackPlugin.options.title %></title>
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <link rel="icon" href="/assets/Stacks128w.png" />
   </head>
   <body>
     <div id="app-root"></div>