Merge commit 'a13b7fd97f35d42d121170270d56bce3e6ecc84e' into fix/30840

* commit 'a13b7fd97f35d42d121170270d56bce3e6ecc84e': Prettier wanted import order changed? Update import order Make lint happy fix: remove underscore feat: new emoji font for Windows
DylanDylann · Nov 6, 2023 · db310a7 · db310a7
2 parents 46f24ef + a13b7fd
commit db310a7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/assets/css/fonts.css b/assets/css/fonts.css
@@ -54,6 +54,11 @@
     src: url('/fonts/ExpensifyNewKansas-MediumItalic.woff2') format('woff2'),  url('/fonts/ExpensifyNewKansas-MediumItalic.woff') format('woff');
 }
 
+@font-face {
+    font-family: Windows Segoe UI Emoji;
+    src: url('/fonts/seguiemj.ttf');
+}
+
 * {
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;

diff --git a/assets/fonts/web/seguiemj.ttf b/assets/fonts/web/seguiemj.ttf
diff --git a/src/styles/fontFamily/multiFontFamily.ts b/src/styles/fontFamily/multiFontFamily.ts
@@ -1,3 +1,5 @@
+import getOperatingSystem from '@libs/getOperatingSystem';
+import CONST from '@src/CONST';
 import {multiBold} from './bold';
 import FontFamilyStyles from './types';
 
@@ -16,4 +18,10 @@ const fontFamily: FontFamilyStyles = {
     MONOSPACE_BOLD_ITALIC: 'ExpensifyMono-Bold, Segoe UI Emoji, Noto Color Emoji',
 };
 
+if (getOperatingSystem() === CONST.OS.WINDOWS) {
+    Object.keys(fontFamily).forEach((key) => {
+        fontFamily[key as keyof FontFamilyStyles] = fontFamily[key as keyof FontFamilyStyles].replace('Segoe UI Emoji', 'Windows Segoe UI Emoji');
+    });
+}
+
 export default fontFamily;