diff --git a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js
index 576544c60273..cd05bcf057b3 100755
--- a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js
+++ b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js
@@ -60,7 +60,7 @@ const BaseHTMLEngineProvider = (props) => {
// We need to pass multiple system-specific fonts for emojis but
// we can't apply multiple fonts at once so we need to pass fallback fonts.
- const fallbackFonts = {'ExpensifyNeue-Regular': fontFamily.EMOJI_TEXT_FONT};
+ const fallbackFonts = {'ExpensifyNeue-Regular': fontFamily.EXP_NEUE};
return (
{
}
return (
diff --git a/src/styles/bold/index.android.js b/src/styles/fontFamily/bold/index.android.js
similarity index 100%
rename from src/styles/bold/index.android.js
rename to src/styles/fontFamily/bold/index.android.js
diff --git a/src/styles/bold/index.js b/src/styles/fontFamily/bold/index.ios.js
similarity index 100%
rename from src/styles/bold/index.js
rename to src/styles/fontFamily/bold/index.ios.js
diff --git a/src/styles/fontFamily/bold/index.js b/src/styles/fontFamily/bold/index.js
new file mode 100644
index 000000000000..66d3c64f3565
--- /dev/null
+++ b/src/styles/fontFamily/bold/index.js
@@ -0,0 +1,3 @@
+const bold = 'ExpensifyNeue-Regular, Segoe UI Emoji, Noto Color Emoji';
+
+export default bold;
diff --git a/src/styles/fontFamily/emoji/index.js b/src/styles/fontFamily/emoji/index.js
deleted file mode 100644
index 67630edf2b2d..000000000000
--- a/src/styles/fontFamily/emoji/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// In windows and ubuntu, we need these system fonts for emojis to work properly
-// otherwise few of them will appear as black and white
-const emojiFont = 'ExpensifyNeue-Regular, Segoe UI Emoji, Noto Color Emoji';
-
-export default emojiFont;
diff --git a/src/styles/fontFamily/emoji/index.native.js b/src/styles/fontFamily/emoji/index.native.js
deleted file mode 100644
index 33273367b5f4..000000000000
--- a/src/styles/fontFamily/emoji/index.native.js
+++ /dev/null
@@ -1,3 +0,0 @@
-const emojiFont = 'ExpensifyNeue-Regular';
-
-export default emojiFont;
diff --git a/src/styles/fontFamily/index.js b/src/styles/fontFamily/index.js
index 3e258bbef7b1..899ef20772de 100644
--- a/src/styles/fontFamily/index.js
+++ b/src/styles/fontFamily/index.js
@@ -1,18 +1,18 @@
-import bold from '../bold';
-import emojiFont from './emoji';
+import bold from './bold';
+// In windows and ubuntu, we need some extra system fonts for emojis to work properly
+// otherwise few of them will appear as black and white
const fontFamily = {
- EXP_NEUE_ITALIC: 'ExpensifyNeue-Italic',
+ EXP_NEUE_ITALIC: 'ExpensifyNeue-Italic, Segoe UI Emoji, Noto Color Emoji',
EXP_NEUE_BOLD: bold,
- EXP_NEUE: 'ExpensifyNeue-Regular',
- EXP_NEW_KANSAS_MEDIUM: 'ExpensifyNewKansas-Medium',
- EXP_NEW_KANSAS_MEDIUM_ITALIC: 'ExpensifyNewKansas-MediumItalic',
+ 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',
- MONOSPACE: 'ExpensifyMono-Regular',
- MONOSPACE_ITALIC: 'ExpensifyMono-Regular',
- MONOSPACE_BOLD: 'ExpensifyMono-Bold',
- MONOSPACE_BOLD_ITALIC: 'ExpensifyMono-Bold',
- EMOJI_TEXT_FONT: emojiFont,
+ MONOSPACE: 'ExpensifyMono-Regular, Segoe UI Emoji, Noto Color Emoji',
+ MONOSPACE_ITALIC: 'ExpensifyMono-Regular, Segoe UI Emoji, Noto Color Emoji',
+ MONOSPACE_BOLD: 'ExpensifyMono-Bold, Segoe UI Emoji, Noto Color Emoji',
+ MONOSPACE_BOLD_ITALIC: 'ExpensifyMono-Bold, Segoe UI Emoji, Noto Color Emoji',
};
export default fontFamily;
diff --git a/src/styles/fontFamily/index.native.js b/src/styles/fontFamily/index.native.js
new file mode 100644
index 000000000000..369d1f66f8f1
--- /dev/null
+++ b/src/styles/fontFamily/index.native.js
@@ -0,0 +1,16 @@
+import bold from './bold';
+
+const fontFamily = {
+ EXP_NEUE_ITALIC: 'ExpensifyNeue-Italic',
+ EXP_NEUE_BOLD: bold,
+ EXP_NEUE: 'ExpensifyNeue-Regular',
+ EXP_NEW_KANSAS_MEDIUM: 'ExpensifyNewKansas-Medium',
+ EXP_NEW_KANSAS_MEDIUM_ITALIC: 'ExpensifyNewKansas-MediumItalic',
+ SYSTEM: 'System',
+ MONOSPACE: 'ExpensifyMono-Regular',
+ MONOSPACE_ITALIC: 'ExpensifyMono-Regular',
+ MONOSPACE_BOLD: 'ExpensifyMono-Bold',
+ MONOSPACE_BOLD_ITALIC: 'ExpensifyMono-Bold',
+};
+
+export default fontFamily;
diff --git a/src/styles/styles.js b/src/styles/styles.js
index 8195eeb75b11..a1afbee704aa 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -187,13 +187,11 @@ const styles = {
},
emojiSuggestionsEmoji: {
- fontFamily: fontFamily.EMOJI_TEXT_FONT,
fontSize: variables.fontSizeMedium,
width: 51,
textAlign: 'center',
},
emojiSuggestionsText: {
- fontFamily: fontFamily.EMOJI_TEXT_FONT,
fontSize: variables.fontSizeMedium,
},
@@ -1546,7 +1544,7 @@ const styles = {
backgroundColor: themeColors.componentBG,
borderColor: themeColors.border,
color: themeColors.text,
- fontFamily: fontFamily.EMOJI_TEXT_FONT,
+ fontFamily: fontFamily.EXP_NEUE,
fontSize: variables.fontSizeNormal,
borderWidth: 0,
height: 'auto',
@@ -1631,7 +1629,6 @@ const styles = {
// Emoji Picker Styles
emojiText: {
- fontFamily: fontFamily.EMOJI_TEXT_FONT,
textAlign: 'center',
fontSize: variables.emojiSize,
...spacing.pv0,