5 files changed, 23 insertions, 5 deletions

diff --git a/recipes b/recipes
-Subproject 7ab6497fbd7bc64c3f2b17b587d273c9bbd155c
+Subproject f02fda1b07952648f84f91bf92343c81c841743
diff --git a/src/api/server/ServerApi.ts b/src/api/server/ServerApi.ts
index b5dd499ab..5434880dc 100644
--- a/src/api/server/ServerApi.ts
+++ b/src/api/server/ServerApi.ts
@@ -12,6 +12,7 @@ import {
   statSync,
   writeFileSync,
 } from 'fs-extra';
+import ms from 'ms';
 import tar from 'tar';
 
 import RecipeModel, { type IRecipe } from '../../models/Recipe';
@@ -460,7 +461,7 @@ export default class ServerApi {
     }
     debug(archivePath);
 
-    await sleep(10);
+    await sleep(ms('10ms'));
 
     await tar.x({
       file: archivePath,
@@ -471,14 +472,21 @@ export default class ServerApi {
       onwarn: x => debug('warn', recipeId, x),
     });
 
-    await sleep(10);
+    await sleep(ms('10ms'));
 
-    const { id } = readJsonSync(join(recipeTempDirectory, 'package.json'));
+    const { id, defaultIcon } = readJsonSync(
+      join(recipeTempDirectory, 'package.json'),
+    );
     const recipeDirectory = join(recipesDirectory, id);
     copySync(recipeTempDirectory, recipeDirectory);
     removeSync(recipeTempDirectory);
     removeSync(join(recipesDirectory, recipeId, 'recipe.tar.gz'));
 
+    // TODO: This is a temporary fix to remove svg icons from the user AppData. This should be removed after versions of all recipes have been bumped up
+    if (defaultIcon) {
+      removeSync(join(recipeDirectory, 'icon.svg'));
+    }
+
     return id;
   }
 
diff --git a/src/containers/auth/SetupAssistantScreen.tsx b/src/containers/auth/SetupAssistantScreen.tsx
index d15b4e6e1..b73b5705d 100644
--- a/src/containers/auth/SetupAssistantScreen.tsx
+++ b/src/containers/auth/SetupAssistantScreen.tsx
@@ -1,4 +1,5 @@
 import { inject, observer } from 'mobx-react';
+import ms from 'ms';
 import { Component, type ReactElement } from 'react';
 import type { StoresProps } from '../../@types/ferdium-components.types';
 import type { ILegacyServices } from '../../@types/legacy-types';
@@ -83,11 +84,11 @@ class SetupAssistantScreen extends Component<IProps, IState> {
       });
 
       // eslint-disable-next-line no-await-in-loop
-      await sleep(100);
+      await sleep(ms('100ms'));
     }
 
     this.setState({ isSettingUpServices: false });
-    await sleep(100);
+    await sleep(ms('100ms'));
     router.push('/');
   }
 
diff --git a/src/models/Recipe.ts b/src/models/Recipe.ts
index 11eb1884f..87043693b 100644
--- a/src/models/Recipe.ts
+++ b/src/models/Recipe.ts
@@ -26,6 +26,7 @@ interface RecipeData {
     message?: string;
     allowFavoritesDelineationInUnreadCount?: boolean;
   };
+  defaultIcon: string;
 }
 
 export interface IRecipe {
@@ -49,6 +50,7 @@ export interface IRecipe {
   path: string;
   partition: string;
   local: boolean;
+  defaultIcon: string;
 
   readonly overrideUserAgent?: () => string;
 
@@ -76,6 +78,8 @@ export default class Recipe implements IRecipe {
 
   version = '';
 
+  defaultIcon = '';
+
   // Removing this specific type will cause a typescript error
   // even while it's the exact same as the interface
   aliases: string[] = [];
@@ -135,6 +139,7 @@ export default class Recipe implements IRecipe {
     // from the recipe
     this.id = ifUndefined<string>(data.id, this.id);
     this.name = ifUndefined<string>(data.name, this.name);
+    this.defaultIcon = ifUndefined<string>(data.defaultIcon, this.defaultIcon);
     this.version = ifUndefined<string>(data.version, this.version);
     this.aliases = ifUndefined<string[]>(data.aliases, this.aliases);
     this.serviceURL = ifUndefined<string>(
diff --git a/src/models/Service.ts b/src/models/Service.ts
index 525661172..a61df5570 100644
--- a/src/models/Service.ts
+++ b/src/models/Service.ts
@@ -377,6 +377,10 @@ export default class Service {
       return this.iconUrl;
     }
 
+    if (this.recipe.defaultIcon) {
+      return this.recipe.defaultIcon;
+    }
+
     return join(this.recipe.path, 'icon.svg');
   }