Merge pull request #38408 from Expensify/scott-revertFlagFont

Revert "Merge pull request #35790 from dragnoir/33653-fix"
Expensify · Mar 15, 2024 · 90ff6b8 · 90ff6b8
2 parents f44c5f4 + 43acdb5
commit 90ff6b8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/assets/css/fonts.css b/assets/css/fonts.css
@@ -55,8 +55,8 @@
 }
 
 @font-face {
-    font-family: Noto Color Emoji;
-    src: url('/fonts/NotoColorEmoji-Regular.woff2') format('woff2'),  url('/fonts/NotoColorEmoji-Regular.woff') format('woff');
+    font-family: Windows Segoe UI Emoji;
+    src: url('/fonts/seguiemj.ttf');
 }
 
 * {

diff --git a/assets/fonts/web/NotoColorEmoji-Regular.woff b/assets/fonts/web/NotoColorEmoji-Regular.woff
diff --git a/assets/fonts/web/NotoColorEmoji-Regular.woff2 b/assets/fonts/web/NotoColorEmoji-Regular.woff2
diff --git a/src/styles/utils/FontUtils/fontFamily/multiFontFamily.ts b/src/styles/utils/FontUtils/fontFamily/multiFontFamily.ts
@@ -8,7 +8,7 @@ import type FontFamilyStyles from './types';
 const fontFamily: FontFamilyStyles = {
     EXP_NEUE_ITALIC: 'ExpensifyNeue-Italic, Segoe UI Emoji, Noto Color Emoji',
     EXP_NEUE_BOLD: multiBold,
-    EXP_NEUE: 'ExpensifyNeue-Regular, Segoe UI Emoji',
+    EXP_NEUE: 'ExpensifyNeue-Regular, Segoe UI Emoji, Noto Color Emoji',
     EXP_NEW_KANSAS_MEDIUM: 'ExpensifyNewKansas-Medium, Segoe UI Emoji, Noto Color Emoji',
     EXP_NEW_KANSAS_MEDIUM_ITALIC: 'ExpensifyNewKansas-MediumItalic, Segoe UI Emoji, Noto Color Emoji',
     SYSTEM: 'System',
@@ -20,7 +20,7 @@ const fontFamily: FontFamilyStyles = {
 
 if (getOperatingSystem() === CONST.OS.WINDOWS) {
     Object.keys(fontFamily).forEach((key) => {
-        fontFamily[key as keyof FontFamilyStyles] = fontFamily[key as keyof FontFamilyStyles].replace('Segoe UI Emoji', 'Noto Color Emoji');
+        fontFamily[key as keyof FontFamilyStyles] = fontFamily[key as keyof FontFamilyStyles].replace('Segoe UI Emoji', 'Windows Segoe UI Emoji');
     });
 }