diff --git a/.storybook/theme.js b/.storybook/theme.js index 641198d20f07..e33243058453 100644 --- a/.storybook/theme.js +++ b/.storybook/theme.js @@ -9,7 +9,7 @@ export default create({ brandImage: 'logomark.svg', colorPrimary: colors.dark, colorSecondary: colors.orange, - fontBase: 'GTAmericaExp-Regular', + fontBase: 'ExpensifyNeue-Regular', fontCode: 'monospace', textInverseColor: colors.black, }); diff --git a/android/app/src/main/assets/fonts/ExpensifyMono-Bold.otf b/android/app/src/main/assets/fonts/Expensify-Mono-Bold.otf similarity index 100% rename from android/app/src/main/assets/fonts/ExpensifyMono-Bold.otf rename to android/app/src/main/assets/fonts/Expensify-Mono-Bold.otf diff --git a/android/app/src/main/assets/fonts/ExpensifyMono-Regular.otf b/android/app/src/main/assets/fonts/Expensify-Mono-Regular.otf similarity index 100% rename from android/app/src/main/assets/fonts/ExpensifyMono-Regular.otf rename to android/app/src/main/assets/fonts/Expensify-Mono-Regular.otf diff --git a/android/app/src/main/assets/fonts/ExpensifyNeue-Bold.otf b/android/app/src/main/assets/fonts/Expensify-Neue-Bold.otf similarity index 100% rename from android/app/src/main/assets/fonts/ExpensifyNeue-Bold.otf rename to android/app/src/main/assets/fonts/Expensify-Neue-Bold.otf diff --git a/android/app/src/main/assets/fonts/ExpensifyNeue-BoldItalic.otf b/android/app/src/main/assets/fonts/Expensify-Neue-BoldItalic.otf similarity index 100% rename from android/app/src/main/assets/fonts/ExpensifyNeue-BoldItalic.otf rename to android/app/src/main/assets/fonts/Expensify-Neue-BoldItalic.otf diff --git a/android/app/src/main/assets/fonts/ExpensifyNeue-Italic.otf b/android/app/src/main/assets/fonts/Expensify-Neue-Italic.otf similarity index 100% rename from android/app/src/main/assets/fonts/ExpensifyNeue-Italic.otf rename to android/app/src/main/assets/fonts/Expensify-Neue-Italic.otf diff --git a/android/app/src/main/assets/fonts/ExpensifyNeue-Regular.otf b/android/app/src/main/assets/fonts/Expensify-Neue-Regular.otf similarity index 100% rename from android/app/src/main/assets/fonts/ExpensifyNeue-Regular.otf rename to android/app/src/main/assets/fonts/Expensify-Neue-Regular.otf diff --git a/android/app/src/main/assets/fonts/ExpensifyNewKansas-Medium.otf b/android/app/src/main/assets/fonts/Expensify-New-Kansas-Medium.otf similarity index 100% rename from android/app/src/main/assets/fonts/ExpensifyNewKansas-Medium.otf rename to android/app/src/main/assets/fonts/Expensify-New-Kansas-Medium.otf diff --git a/android/app/src/main/assets/fonts/ExpensifyNewKansas-MediumItalic.otf b/android/app/src/main/assets/fonts/Expensify-New-Kansas-MediumItalic.otf similarity index 100% rename from android/app/src/main/assets/fonts/ExpensifyNewKansas-MediumItalic.otf rename to android/app/src/main/assets/fonts/Expensify-New-Kansas-MediumItalic.otf diff --git a/android/app/src/main/assets/fonts/GTAmericaExp-BdIt.otf b/android/app/src/main/assets/fonts/GTAmericaExp-BdIt.otf deleted file mode 100755 index b0b9e28e6786..000000000000 Binary files a/android/app/src/main/assets/fonts/GTAmericaExp-BdIt.otf and /dev/null differ diff --git a/android/app/src/main/assets/fonts/GTAmericaExp-Bold.otf b/android/app/src/main/assets/fonts/GTAmericaExp-Bold.otf deleted file mode 100644 index 58d3be114e47..000000000000 Binary files a/android/app/src/main/assets/fonts/GTAmericaExp-Bold.otf and /dev/null differ diff --git a/android/app/src/main/assets/fonts/GTAmericaExp-Light.otf b/android/app/src/main/assets/fonts/GTAmericaExp-Light.otf deleted file mode 100644 index 512b53fa37b3..000000000000 Binary files a/android/app/src/main/assets/fonts/GTAmericaExp-Light.otf and /dev/null differ diff --git a/android/app/src/main/assets/fonts/GTAmericaExp-MdIt.otf b/android/app/src/main/assets/fonts/GTAmericaExp-MdIt.otf deleted file mode 100755 index 05aee02bbf80..000000000000 Binary files a/android/app/src/main/assets/fonts/GTAmericaExp-MdIt.otf and /dev/null differ diff --git a/android/app/src/main/assets/fonts/GTAmericaExp-Medium.otf b/android/app/src/main/assets/fonts/GTAmericaExp-Medium.otf deleted file mode 100644 index 0e9d3629ce23..000000000000 Binary files a/android/app/src/main/assets/fonts/GTAmericaExp-Medium.otf and /dev/null differ diff --git a/android/app/src/main/assets/fonts/GTAmericaExp-Regular.otf b/android/app/src/main/assets/fonts/GTAmericaExp-Regular.otf deleted file mode 100644 index 02f39bc35445..000000000000 Binary files a/android/app/src/main/assets/fonts/GTAmericaExp-Regular.otf and /dev/null differ diff --git a/android/app/src/main/assets/fonts/GTAmericaExp-RgIt.otf b/android/app/src/main/assets/fonts/GTAmericaExp-RgIt.otf deleted file mode 100755 index 9cb4f78ff57e..000000000000 Binary files a/android/app/src/main/assets/fonts/GTAmericaExp-RgIt.otf and /dev/null differ diff --git a/android/app/src/main/assets/fonts/GTAmericaExp-Thin.otf b/android/app/src/main/assets/fonts/GTAmericaExp-Thin.otf deleted file mode 100644 index 0557381f1353..000000000000 Binary files a/android/app/src/main/assets/fonts/GTAmericaExp-Thin.otf and /dev/null differ diff --git a/android/app/src/main/assets/fonts/GTAmericaExpMono-Bd.otf b/android/app/src/main/assets/fonts/GTAmericaExpMono-Bd.otf deleted file mode 100755 index ba733848f1d9..000000000000 Binary files a/android/app/src/main/assets/fonts/GTAmericaExpMono-Bd.otf and /dev/null differ diff --git a/android/app/src/main/assets/fonts/GTAmericaExpMono-BdIt.otf b/android/app/src/main/assets/fonts/GTAmericaExpMono-BdIt.otf deleted file mode 100755 index 063e653c8b52..000000000000 Binary files a/android/app/src/main/assets/fonts/GTAmericaExpMono-BdIt.otf and /dev/null differ diff --git a/android/app/src/main/assets/fonts/GTAmericaExpMono-Rg.otf b/android/app/src/main/assets/fonts/GTAmericaExpMono-Rg.otf deleted file mode 100644 index 2786ecdc0cf5..000000000000 Binary files a/android/app/src/main/assets/fonts/GTAmericaExpMono-Rg.otf and /dev/null differ diff --git a/android/app/src/main/assets/fonts/GTAmericaExpMono-RgIt.otf b/android/app/src/main/assets/fonts/GTAmericaExpMono-RgIt.otf deleted file mode 100755 index 6852a3391dae..000000000000 Binary files a/android/app/src/main/assets/fonts/GTAmericaExpMono-RgIt.otf and /dev/null differ diff --git a/assets/css/fonts.css b/assets/css/fonts.css index a58f45bb3b0f..03f4d019b731 100644 --- a/assets/css/fonts.css +++ b/assets/css/fonts.css @@ -1,92 +1,43 @@ @font-face { - font-family: GTAmericaExp-Regular; - font-weight: 100; - font-style: normal; - src: url("https://www.expensify.com/font/GT-America-Standard-Light.eot") format("embedded-opentype"), url("https://www.expensify.com/font/GT-America-Standard-Light.woff") format("woff"), url("https://www.expensify.com/font/GT-America-Standard-Light.woff2") format("woff2"); -} - -@font-face { - font-family: GTAmericaExp-Regular; - font-weight: 200; - font-style: normal; - src: url("https://www.expensify.com/font/GT-America-Standard-Thin.eot") format("embedded-opentype"), url("https://www.expensify.com/font/GT-America-Standard-Thin.woff") format("woff"), url("https://www.expensify.com/font/GT-America-Standard-Thin.woff2") format("woff2"); -} - -@font-face { - font-family: GTAmericaExp-Regular; + font-family: ExpensifyNeue-Regular; font-weight: 400; font-style: normal; - src: url("https://www.expensify.com/font/GT-America-Standard-Regular.eot") format("embedded-opentype"), url("https://www.expensify.com/font/GT-America-Standard-Regular.woff") format("woff"), url("https://www.expensify.com/font/GT-America-Standard-Regular.woff2") format("woff2"); -} - -@font-face { - font-family: GTAmericaExp-Regular; - font-weight: 500; - font-style: normal; - src: url("https://www.expensify.com/font/GT-America-Standard-Medium.eot") format("embedded-opentype"), url("https://www.expensify.com/font/GT-America-Standard-Medium.woff") format("woff"), url("https://www.expensify.com/font/GT-America-Standard-Medium.woff2") format("woff2"); -} - -@font-face { - font-family: GTAmericaExp-Regular; - font-weight: 600; - font-style: normal; - src: url("https://www.expensify.com/font/GT-America-Standard-Medium.eot") format("embedded-opentype"), url("https://www.expensify.com/font/GT-America-Standard-Medium.woff") format("woff"), url("https://www.expensify.com/font/GT-America-Standard-Medium.woff2") format("woff2"); + src: url('/fonts/ExpensifyNeue-Regular.woff2') format('woff2'), url('/fonts/ExpensifyNeue-Regular.woff') format('woff'); } @font-face { - font-family: GTAmericaExp-Regular; + font-family: ExpensifyNeue-Bold; font-weight: 700; font-style: normal; - src: url("https://www.expensify.com/font/GT-America-Standard-Bold.eot") format("embedded-opentype"), url("https://www.expensify.com/font/GT-America-Standard-Bold.woff") format("woff"), url("https://www.expensify.com/font/GT-America-Standard-Bold.woff2") format("woff2"); + src: url('/fonts/ExpensifyNeue-Bold.woff2') format('woff2'), url('/fonts/ExpensifyNeue-Bold.woff') format('woff'); } @font-face { - font-family: GTAmericaExp-RgIt; + font-family: ExpensifyNeue-Italic; font-weight: 400; - font-style: italic; - src: url("https://www.expensify.com/font/GT-America-Standard-Regular-Italic.eot") format("embedded-opentype"), url("https://www.expensify.com/font/GT-America-Standard-Regular-Italic.woff") format("woff"), url("https://www.expensify.com/font/GT-America-Standard-Regular-Italic.woff2") format("woff2"); -} - -@font-face { - font-family: GTAmericaExp-MdIt; - font-weight: 500; - font-style: italic; - src: url("https://www.expensify.com/font/GT-America-Standard-Medium-Italic.eot") format("embedded-opentype"), url("https://www.expensify.com/font/GT-America-Standard-Medium-Italic.woff") format("woff"), url("https://www.expensify.com/font/GT-America-Standard-Medium-Italic.woff2") format("woff2"); + font-style: normal; + src: url('/fonts/ExpensifyNeue-Italic.woff2') format('woff2'), url('/fonts/ExpensifyNeue-Italic.woff') format('woff'); } @font-face { - font-family: GTAmericaExp-BdIt; + font-family: ExpensifyNeue-BoldItalic; font-weight: 700; - font-style: italic; - src: url("https://www.expensify.com/font/GT-America-Standard-Bold-Italic.eot") format("embedded-opentype"), url("https://www.expensify.com/font/GT-America-Standard-Bold-Italic.woff") format("woff"), url("https://www.expensify.com/font/GT-America-Standard-Bold-Italic.woff2") format("woff2"); -} - -@font-face { - font-family: GTAmericaExpMono-Rg; - font-weight: 400; font-style: normal; - src: url('https://www.expensify.com/font/GT-America-Exp-Mono-Regular.eot') format('embedded-opentype'), url('https://www.expensify.com/font/GT-America-Exp-Mono-Regular.woff') format('woff'), url('https://www.expensify.com/font/GT-America-Exp-Mono-Regular.woff2') format('woff2'); + src: url('/fonts/ExpensifyNeue-BoldItalic.woff2') format('woff2'), url('/fonts/ExpensifyNeue-BoldItalic.woff') format('woff'); } @font-face { - font-family: GTAmericaExpMono-RgIt; + font-family: ExpensifyMono-Regular; font-weight: 400; - font-style: italic; - src: url('https://www.expensify.com/font/GT-America-Exp-Mono-Regular-Italic.eot') format('embedded-opentype'), url('https://www.expensify.com/font/GT-America-Exp-Mono-Regular-Italic.woff') format('woff'), url('https://www.expensify.com/font/GT-America-Exp-Mono-Regular-Italic.woff2') format('woff2'); -} - -@font-face { - font-family: GTAmericaExpMono-Bd; - font-weight: 700; font-style: normal; - src: url('https://www.expensify.com/font/GT-America-Exp-Mono-Bold.eot') format('embedded-opentype'), url('https://www.expensify.com/font/GT-America-Exp-Mono-Bold.woff') format('woff'), url('https://www.expensify.com/font/GT-America-Exp-Mono-Bold.woff2') format('woff2'); + src: url('/fonts/ExpensifyMono-Regular.woff2') format('woff2'), url('/fonts/ExpensifyMono-Regular.woff') format('woff'); } @font-face { - font-family: GTAmericaExpMono-BdIt; + font-family: ExpensifyMono-Bold; font-weight: 700; - font-style: italic; - src: url('https://www.expensify.com/font/GT-America-Exp-Mono-Bold-Italic.eot') format('embedded-opentype'), url('https://www.expensify.com/font/GT-America-Exp-Mono-Bold-Italic.woff') format('woff'), url('https://www.expensify.com/font/GT-America-Exp-Mono-Bold-Italic.woff2') format('woff2'); + font-style: normal; + src: url('/fonts/ExpensifyMono-Bold.woff2') format('woff2'), url('/fonts/ExpensifyMono-Bold.woff') format('woff'); } * { diff --git a/assets/fonts/ExpensifyMono-Bold.woff b/assets/fonts/ExpensifyMono-Bold.woff new file mode 100755 index 000000000000..6cbe62241ccb Binary files /dev/null and b/assets/fonts/ExpensifyMono-Bold.woff differ diff --git a/assets/fonts/ExpensifyMono-Bold.woff2 b/assets/fonts/ExpensifyMono-Bold.woff2 new file mode 100755 index 000000000000..73a872d7612c Binary files /dev/null and b/assets/fonts/ExpensifyMono-Bold.woff2 differ diff --git a/assets/fonts/ExpensifyMono-Regular.woff b/assets/fonts/ExpensifyMono-Regular.woff new file mode 100755 index 000000000000..094b25062760 Binary files /dev/null and b/assets/fonts/ExpensifyMono-Regular.woff differ diff --git a/assets/fonts/ExpensifyMono-Regular.woff2 b/assets/fonts/ExpensifyMono-Regular.woff2 new file mode 100755 index 000000000000..497eed2191c0 Binary files /dev/null and b/assets/fonts/ExpensifyMono-Regular.woff2 differ diff --git a/assets/fonts/ExpensifyNeue-Bold.woff b/assets/fonts/ExpensifyNeue-Bold.woff new file mode 100755 index 000000000000..387c232dffcc Binary files /dev/null and b/assets/fonts/ExpensifyNeue-Bold.woff differ diff --git a/assets/fonts/ExpensifyNeue-Bold.woff2 b/assets/fonts/ExpensifyNeue-Bold.woff2 new file mode 100755 index 000000000000..36ba41100e56 Binary files /dev/null and b/assets/fonts/ExpensifyNeue-Bold.woff2 differ diff --git a/assets/fonts/ExpensifyNeue-BoldItalic.woff b/assets/fonts/ExpensifyNeue-BoldItalic.woff new file mode 100755 index 000000000000..fae33b057ef9 Binary files /dev/null and b/assets/fonts/ExpensifyNeue-BoldItalic.woff differ diff --git a/assets/fonts/ExpensifyNeue-BoldItalic.woff2 b/assets/fonts/ExpensifyNeue-BoldItalic.woff2 new file mode 100755 index 000000000000..40829f25d10b Binary files /dev/null and b/assets/fonts/ExpensifyNeue-BoldItalic.woff2 differ diff --git a/assets/fonts/ExpensifyNeue-Italic.woff b/assets/fonts/ExpensifyNeue-Italic.woff new file mode 100755 index 000000000000..6592e735e982 Binary files /dev/null and b/assets/fonts/ExpensifyNeue-Italic.woff differ diff --git a/assets/fonts/ExpensifyNeue-Italic.woff2 b/assets/fonts/ExpensifyNeue-Italic.woff2 new file mode 100755 index 000000000000..1085e342cd14 Binary files /dev/null and b/assets/fonts/ExpensifyNeue-Italic.woff2 differ diff --git a/assets/fonts/ExpensifyNeue-Regular.woff b/assets/fonts/ExpensifyNeue-Regular.woff new file mode 100755 index 000000000000..a8a311d59e77 Binary files /dev/null and b/assets/fonts/ExpensifyNeue-Regular.woff differ diff --git a/assets/fonts/ExpensifyNeue-Regular.woff2 b/assets/fonts/ExpensifyNeue-Regular.woff2 new file mode 100755 index 000000000000..cdec638e361b Binary files /dev/null and b/assets/fonts/ExpensifyNeue-Regular.woff2 differ diff --git a/assets/fonts/GTAmericaExp-BdIt.otf b/assets/fonts/GTAmericaExp-BdIt.otf deleted file mode 100755 index b0b9e28e6786..000000000000 Binary files a/assets/fonts/GTAmericaExp-BdIt.otf and /dev/null differ diff --git a/assets/fonts/GTAmericaExp-Bold.otf b/assets/fonts/GTAmericaExp-Bold.otf deleted file mode 100644 index 58d3be114e47..000000000000 Binary files a/assets/fonts/GTAmericaExp-Bold.otf and /dev/null differ diff --git a/assets/fonts/GTAmericaExp-Light.otf b/assets/fonts/GTAmericaExp-Light.otf deleted file mode 100644 index 512b53fa37b3..000000000000 Binary files a/assets/fonts/GTAmericaExp-Light.otf and /dev/null differ diff --git a/assets/fonts/GTAmericaExp-MdIt.otf b/assets/fonts/GTAmericaExp-MdIt.otf deleted file mode 100755 index 05aee02bbf80..000000000000 Binary files a/assets/fonts/GTAmericaExp-MdIt.otf and /dev/null differ diff --git a/assets/fonts/GTAmericaExp-Medium.otf b/assets/fonts/GTAmericaExp-Medium.otf deleted file mode 100644 index 0e9d3629ce23..000000000000 Binary files a/assets/fonts/GTAmericaExp-Medium.otf and /dev/null differ diff --git a/assets/fonts/GTAmericaExp-Regular.otf b/assets/fonts/GTAmericaExp-Regular.otf deleted file mode 100644 index 02f39bc35445..000000000000 Binary files a/assets/fonts/GTAmericaExp-Regular.otf and /dev/null differ diff --git a/assets/fonts/GTAmericaExp-RgIt.otf b/assets/fonts/GTAmericaExp-RgIt.otf deleted file mode 100755 index 9cb4f78ff57e..000000000000 Binary files a/assets/fonts/GTAmericaExp-RgIt.otf and /dev/null differ diff --git a/assets/fonts/GTAmericaExp-Thin.otf b/assets/fonts/GTAmericaExp-Thin.otf deleted file mode 100644 index 0557381f1353..000000000000 Binary files a/assets/fonts/GTAmericaExp-Thin.otf and /dev/null differ diff --git a/assets/fonts/GTAmericaExpMono-Bd.otf b/assets/fonts/GTAmericaExpMono-Bd.otf deleted file mode 100755 index ba733848f1d9..000000000000 Binary files a/assets/fonts/GTAmericaExpMono-Bd.otf and /dev/null differ diff --git a/assets/fonts/GTAmericaExpMono-BdIt.otf b/assets/fonts/GTAmericaExpMono-BdIt.otf deleted file mode 100755 index 063e653c8b52..000000000000 Binary files a/assets/fonts/GTAmericaExpMono-BdIt.otf and /dev/null differ diff --git a/assets/fonts/GTAmericaExpMono-Rg.otf b/assets/fonts/GTAmericaExpMono-Rg.otf deleted file mode 100644 index 2786ecdc0cf5..000000000000 Binary files a/assets/fonts/GTAmericaExpMono-Rg.otf and /dev/null differ diff --git a/assets/fonts/GTAmericaExpMono-RgIt.otf b/assets/fonts/GTAmericaExpMono-RgIt.otf deleted file mode 100755 index 6852a3391dae..000000000000 Binary files a/assets/fonts/GTAmericaExpMono-RgIt.otf and /dev/null differ diff --git a/config/webpack/webpack.common.js b/config/webpack/webpack.common.js index 0b555105300a..fa8f4c049104 100644 --- a/config/webpack/webpack.common.js +++ b/config/webpack/webpack.common.js @@ -90,6 +90,7 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({ {from: 'web/favicon-unread.png'}, {from: 'web/og-preview-image.png'}, {from: 'assets/css', to: 'css'}, + {from: 'assets/fonts', to: 'fonts'}, {from: 'node_modules/react-pdf/dist/esm/Page/AnnotationLayer.css', to: 'css/AnnotationLayer.css'}, {from: 'assets/images/shadow.png', to: 'images/shadow.png'}, {from: '.well-known/apple-app-site-association', to: '.well-known/apple-app-site-association', toType: 'file'}, @@ -187,6 +188,10 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({ test: /\.css$/i, use: ['style-loader', 'css-loader'], }, + { + test: /\.(woff|woff2)$/i, + type: 'asset', + }, { resourceQuery: /raw/, type: 'asset/source', diff --git a/ios/ExpensifyMono-Bold.otf b/ios/ExpensifyMono-Bold.otf deleted file mode 100755 index 4198f46f6d79..000000000000 Binary files a/ios/ExpensifyMono-Bold.otf and /dev/null differ diff --git a/ios/ExpensifyMono-Regular.otf b/ios/ExpensifyMono-Regular.otf deleted file mode 100755 index 1c6242a717f9..000000000000 Binary files a/ios/ExpensifyMono-Regular.otf and /dev/null differ diff --git a/ios/ExpensifyNeue-Bold.otf b/ios/ExpensifyNeue-Bold.otf deleted file mode 100755 index 7534aecda322..000000000000 Binary files a/ios/ExpensifyNeue-Bold.otf and /dev/null differ diff --git a/ios/ExpensifyNeue-BoldItalic.otf b/ios/ExpensifyNeue-BoldItalic.otf deleted file mode 100755 index 4c28031fedd6..000000000000 Binary files a/ios/ExpensifyNeue-BoldItalic.otf and /dev/null differ diff --git a/ios/ExpensifyNeue-Italic.otf b/ios/ExpensifyNeue-Italic.otf deleted file mode 100755 index a5d19502dbfe..000000000000 Binary files a/ios/ExpensifyNeue-Italic.otf and /dev/null differ diff --git a/ios/ExpensifyNeue-Regular.otf b/ios/ExpensifyNeue-Regular.otf deleted file mode 100755 index d4d8cbe63b44..000000000000 Binary files a/ios/ExpensifyNeue-Regular.otf and /dev/null differ diff --git a/ios/ExpensifyNewKansas-Medium.otf b/ios/ExpensifyNewKansas-Medium.otf deleted file mode 100755 index a7277555fad9..000000000000 Binary files a/ios/ExpensifyNewKansas-Medium.otf and /dev/null differ diff --git a/ios/ExpensifyNewKansas-MediumItalic.otf b/ios/ExpensifyNewKansas-MediumItalic.otf deleted file mode 100755 index 984ef4bfa2d4..000000000000 Binary files a/ios/ExpensifyNewKansas-MediumItalic.otf and /dev/null differ diff --git a/ios/NewExpensify.xcodeproj/project.pbxproj b/ios/NewExpensify.xcodeproj/project.pbxproj index 2b3119b554f4..708956b75d26 100644 --- a/ios/NewExpensify.xcodeproj/project.pbxproj +++ b/ios/NewExpensify.xcodeproj/project.pbxproj @@ -15,28 +15,24 @@ 0F5BE0CE252686330097D869 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 0F5BE0CD252686320097D869 /* GoogleService-Info.plist */; }; 0F5E5350263B73FD004CA14F /* EnvironmentChecker.m in Sources */ = {isa = PBXBuildFile; fileRef = 0F5E534F263B73FD004CA14F /* EnvironmentChecker.m */; }; 0F5E5351263B73FD004CA14F /* EnvironmentChecker.m in Sources */ = {isa = PBXBuildFile; fileRef = 0F5E534F263B73FD004CA14F /* EnvironmentChecker.m */; }; - 12DD1878FCB9487C9F031C86 /* GTAmericaExpMono-Rg.otf in Resources */ = {isa = PBXBuildFile; fileRef = 8437A5A38F2047E0BCCD7C2F /* GTAmericaExpMono-Rg.otf */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 18D050E0262400AF000D658B /* BridgingFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18D050DF262400AF000D658B /* BridgingFile.swift */; }; - 1E76D5212522316A005A268F /* GTAmericaExp-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = A5AAD008CBD84A6CAEB9AC97 /* GTAmericaExp-Bold.otf */; }; - 1E76D5222522316A005A268F /* GTAmericaExp-Light.otf in Resources */ = {isa = PBXBuildFile; fileRef = 67D5C3A6A7FA417C8A853FC1 /* GTAmericaExp-Light.otf */; }; - 1E76D5232522316A005A268F /* GTAmericaExp-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = AE65058949E14DA5A2D5435D /* GTAmericaExp-Medium.otf */; }; - 1E76D5242522316A005A268F /* GTAmericaExp-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 8C7003903C1E4957824899BB /* GTAmericaExp-Regular.otf */; }; - 1E76D5252522316A005A268F /* GTAmericaExp-Thin.otf in Resources */ = {isa = PBXBuildFile; fileRef = A292718541C841859D97DF2F /* GTAmericaExp-Thin.otf */; }; 374FB8D728A133FE000D84EF /* OriginImageRequestHandler.mm in Sources */ = {isa = PBXBuildFile; fileRef = 374FB8D628A133FE000D84EF /* OriginImageRequestHandler.mm */; }; - 425866037F4C482AAB46CB8B /* GTAmericaExp-BdIt.otf in Resources */ = {isa = PBXBuildFile; fileRef = A8D6F2F722FD4E66A38EBBB6 /* GTAmericaExp-BdIt.otf */; }; - 52477A09739546F4814EA25F /* GTAmericaExpMono-Bd.otf in Resources */ = {isa = PBXBuildFile; fileRef = 0DE5D096095C41EE96746C9E /* GTAmericaExpMono-Bd.otf */; }; + 597489DE2936B81100AE6F8B /* ExpensifyNeue-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 593541512915C8CF001E81A5 /* ExpensifyNeue-Bold.otf */; }; + 597489DF2936B81400AE6F8B /* ExpensifyMono-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 593541522915C8DF001E81A5 /* ExpensifyMono-Bold.otf */; }; + 597489E02936B81600AE6F8B /* ExpensifyMono-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 593541532915C8DF001E81A5 /* ExpensifyMono-Regular.otf */; }; + 597489E12936B81900AE6F8B /* ExpensifyNewKansas-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = 593541542915C8ED001E81A5 /* ExpensifyNewKansas-Medium.otf */; }; + 597489E22936B81C00AE6F8B /* ExpensifyNewKansas-MediumItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 593541552915C8ED001E81A5 /* ExpensifyNewKansas-MediumItalic.otf */; }; + 597489E32936B81E00AE6F8B /* ExpensifyNeue-BoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 5935414F2915C8CF001E81A5 /* ExpensifyNeue-BoldItalic.otf */; }; + 597489E42936B82000AE6F8B /* ExpensifyNeue-Italic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 593541502915C8CF001E81A5 /* ExpensifyNeue-Italic.otf */; }; + 597489E52936B82200AE6F8B /* ExpensifyNeue-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 5935414E2915C8CF001E81A5 /* ExpensifyNeue-Regular.otf */; }; 5E2EE3856BE7BC98F354B110 /* libPods-NewExpensify.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EDF186626B8D2CBA203E08D /* libPods-NewExpensify.a */; }; - 6856B78873B64C44A92E51DB /* GTAmericaExp-MdIt.otf in Resources */ = {isa = PBXBuildFile; fileRef = DB5A1365442D4419AF6F08E5 /* GTAmericaExp-MdIt.otf */; }; 7041848526A8E47D00E09F4D /* RCTStartupTimer.m in Sources */ = {isa = PBXBuildFile; fileRef = 7041848426A8E47D00E09F4D /* RCTStartupTimer.m */; }; 7041848626A8E47D00E09F4D /* RCTStartupTimer.m in Sources */ = {isa = PBXBuildFile; fileRef = 7041848426A8E47D00E09F4D /* RCTStartupTimer.m */; }; 70CF6E82262E297300711ADC /* BootSplash.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 70CF6E81262E297300711ADC /* BootSplash.storyboard */; }; - 8821A238A081483FA947BC4E /* GTAmericaExp-RgIt.otf in Resources */ = {isa = PBXBuildFile; fileRef = 918D7FEFF96242E6B5F5E14D /* GTAmericaExp-RgIt.otf */; }; - DB77016704074197AB6633BB /* GTAmericaExpMono-RgIt.otf in Resources */ = {isa = PBXBuildFile; fileRef = 5150E5D0D7F74DBA8D7C1914 /* GTAmericaExpMono-RgIt.otf */; }; DD79042B2792E76D004484B4 /* RCTBootSplash.m in Sources */ = {isa = PBXBuildFile; fileRef = DD79042A2792E76D004484B4 /* RCTBootSplash.m */; }; E3B48DC1ED4CC64F660388A8 /* libPods-NewExpensify-NewExpensifyTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A2695CF895D81C31AFB4A074 /* libPods-NewExpensify-NewExpensifyTests.a */; }; E9DF872D2525201700607FDC /* AirshipConfig.plist in Resources */ = {isa = PBXBuildFile; fileRef = E9DF872C2525201700607FDC /* AirshipConfig.plist */; }; - ED814D34526B415CAFA0451E /* GTAmericaExpMono-BdIt.otf in Resources */ = {isa = PBXBuildFile; fileRef = 3981452A2C7340EBBA2B9BD1 /* GTAmericaExpMono-BdIt.otf */; }; F0C450EA2705020500FD2970 /* colors.json in Resources */ = {isa = PBXBuildFile; fileRef = F0C450E92705020500FD2970 /* colors.json */; }; /* End PBXBuildFile section */ @@ -60,7 +56,6 @@ 02BB59C8C4E7D63E4192F2FA /* Pods-NewExpensify-NewExpensifyTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify-NewExpensifyTests.debug.xcconfig"; path = "Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests.debug.xcconfig"; sourceTree = ""; }; 0CDA8E33287DD650004ECBEC /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = NewExpensify/AppDelegate.mm; sourceTree = ""; }; 0CDA8E36287DD6A0004ECBEC /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = NewExpensify/Images.xcassets; sourceTree = ""; }; - 0DE5D096095C41EE96746C9E /* GTAmericaExpMono-Bd.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "GTAmericaExpMono-Bd.otf"; path = "../assets/fonts/GTAmericaExpMono-Bd.otf"; sourceTree = ""; }; 0F5BE0CD252686320097D869 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 0F5E534E263B73D5004CA14F /* EnvironmentChecker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EnvironmentChecker.h; sourceTree = ""; }; 0F5E534F263B73FD004CA14F /* EnvironmentChecker.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EnvironmentChecker.m; sourceTree = ""; }; @@ -71,31 +66,20 @@ 18D050DF262400AF000D658B /* BridgingFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BridgingFile.swift; sourceTree = ""; }; 374FB8D528A133A7000D84EF /* OriginImageRequestHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OriginImageRequestHandler.h; path = NewExpensify/OriginImageRequestHandler.h; sourceTree = ""; }; 374FB8D628A133FE000D84EF /* OriginImageRequestHandler.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = OriginImageRequestHandler.mm; path = NewExpensify/OriginImageRequestHandler.mm; sourceTree = ""; }; - 3981452A2C7340EBBA2B9BD1 /* GTAmericaExpMono-BdIt.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "GTAmericaExpMono-BdIt.otf"; path = "../assets/fonts/GTAmericaExpMono-BdIt.otf"; sourceTree = ""; }; 3EDF186626B8D2CBA203E08D /* libPods-NewExpensify.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-NewExpensify.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 5150E5D0D7F74DBA8D7C1914 /* GTAmericaExpMono-RgIt.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "GTAmericaExpMono-RgIt.otf"; path = "../assets/fonts/GTAmericaExpMono-RgIt.otf"; sourceTree = ""; }; - 5935414E2915C8CF001E81A5 /* ExpensifyNeue-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "ExpensifyNeue-Regular.otf"; sourceTree = ""; }; - 5935414F2915C8CF001E81A5 /* ExpensifyNeue-BoldItalic.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "ExpensifyNeue-BoldItalic.otf"; sourceTree = ""; }; - 593541502915C8CF001E81A5 /* ExpensifyNeue-Italic.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "ExpensifyNeue-Italic.otf"; sourceTree = ""; }; - 593541512915C8CF001E81A5 /* ExpensifyNeue-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "ExpensifyNeue-Bold.otf"; sourceTree = ""; }; - 593541522915C8DF001E81A5 /* ExpensifyMono-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "ExpensifyMono-Bold.otf"; sourceTree = ""; }; - 593541532915C8DF001E81A5 /* ExpensifyMono-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "ExpensifyMono-Regular.otf"; sourceTree = ""; }; - 593541542915C8ED001E81A5 /* ExpensifyNewKansas-Medium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "ExpensifyNewKansas-Medium.otf"; sourceTree = ""; }; - 593541552915C8ED001E81A5 /* ExpensifyNewKansas-MediumItalic.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "ExpensifyNewKansas-MediumItalic.otf"; sourceTree = ""; }; - 67D5C3A6A7FA417C8A853FC1 /* GTAmericaExp-Light.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "GTAmericaExp-Light.otf"; path = "../assets/fonts/GTAmericaExp-Light.otf"; sourceTree = ""; }; + 5935414E2915C8CF001E81A5 /* ExpensifyNeue-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "ExpensifyNeue-Regular.otf"; path = "../assets/fonts/ExpensifyNeue-Regular.otf"; sourceTree = ""; }; + 5935414F2915C8CF001E81A5 /* ExpensifyNeue-BoldItalic.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "ExpensifyNeue-BoldItalic.otf"; path = "../assets/fonts/ExpensifyNeue-BoldItalic.otf"; sourceTree = ""; }; + 593541502915C8CF001E81A5 /* ExpensifyNeue-Italic.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "ExpensifyNeue-Italic.otf"; path = "../assets/fonts/ExpensifyNeue-Italic.otf"; sourceTree = ""; }; + 593541512915C8CF001E81A5 /* ExpensifyNeue-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "ExpensifyNeue-Bold.otf"; path = "../assets/fonts/ExpensifyNeue-Bold.otf"; sourceTree = ""; }; + 593541522915C8DF001E81A5 /* ExpensifyMono-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "ExpensifyMono-Bold.otf"; path = "../assets/fonts/ExpensifyMono-Bold.otf"; sourceTree = ""; }; + 593541532915C8DF001E81A5 /* ExpensifyMono-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "ExpensifyMono-Regular.otf"; path = "../assets/fonts/ExpensifyMono-Regular.otf"; sourceTree = ""; }; + 593541542915C8ED001E81A5 /* ExpensifyNewKansas-Medium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "ExpensifyNewKansas-Medium.otf"; path = "../assets/fonts/ExpensifyNewKansas-Medium.otf"; sourceTree = ""; }; + 593541552915C8ED001E81A5 /* ExpensifyNewKansas-MediumItalic.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "ExpensifyNewKansas-MediumItalic.otf"; path = "../assets/fonts/ExpensifyNewKansas-MediumItalic.otf"; sourceTree = ""; }; 7041848326A8E40900E09F4D /* RCTStartupTimer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RCTStartupTimer.h; path = NewExpensify/RCTStartupTimer.h; sourceTree = ""; }; 7041848426A8E47D00E09F4D /* RCTStartupTimer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = RCTStartupTimer.m; path = NewExpensify/RCTStartupTimer.m; sourceTree = ""; }; 70CF6E81262E297300711ADC /* BootSplash.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = BootSplash.storyboard; path = NewExpensify/BootSplash.storyboard; sourceTree = ""; }; - 8437A5A38F2047E0BCCD7C2F /* GTAmericaExpMono-Rg.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "GTAmericaExpMono-Rg.otf"; path = "../assets/fonts/GTAmericaExpMono-Rg.otf"; sourceTree = ""; }; - 8C7003903C1E4957824899BB /* GTAmericaExp-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "GTAmericaExp-Regular.otf"; path = "../assets/fonts/GTAmericaExp-Regular.otf"; sourceTree = ""; }; - 918D7FEFF96242E6B5F5E14D /* GTAmericaExp-RgIt.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "GTAmericaExp-RgIt.otf"; path = "../assets/fonts/GTAmericaExp-RgIt.otf"; sourceTree = ""; }; A2695CF895D81C31AFB4A074 /* libPods-NewExpensify-NewExpensifyTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-NewExpensify-NewExpensifyTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - A292718541C841859D97DF2F /* GTAmericaExp-Thin.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "GTAmericaExp-Thin.otf"; path = "../assets/fonts/GTAmericaExp-Thin.otf"; sourceTree = ""; }; - A5AAD008CBD84A6CAEB9AC97 /* GTAmericaExp-Bold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "GTAmericaExp-Bold.otf"; path = "../assets/fonts/GTAmericaExp-Bold.otf"; sourceTree = ""; }; - A8D6F2F722FD4E66A38EBBB6 /* GTAmericaExp-BdIt.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "GTAmericaExp-BdIt.otf"; path = "../assets/fonts/GTAmericaExp-BdIt.otf"; sourceTree = ""; }; - AE65058949E14DA5A2D5435D /* GTAmericaExp-Medium.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "GTAmericaExp-Medium.otf"; path = "../assets/fonts/GTAmericaExp-Medium.otf"; sourceTree = ""; }; B66D52EC75F78B8A06F1E035 /* Pods-NewExpensify.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify.debug.xcconfig"; path = "Target Support Files/Pods-NewExpensify/Pods-NewExpensify.debug.xcconfig"; sourceTree = ""; }; - DB5A1365442D4419AF6F08E5 /* GTAmericaExp-MdIt.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "GTAmericaExp-MdIt.otf"; path = "../assets/fonts/GTAmericaExp-MdIt.otf"; sourceTree = ""; }; DD7904292792E76D004484B4 /* RCTBootSplash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RCTBootSplash.h; path = NewExpensify/RCTBootSplash.h; sourceTree = ""; }; DD79042A2792E76D004484B4 /* RCTBootSplash.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RCTBootSplash.m; path = NewExpensify/RCTBootSplash.m; sourceTree = ""; }; E9DF872C2525201700607FDC /* AirshipConfig.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = AirshipConfig.plist; sourceTree = ""; }; @@ -213,7 +197,6 @@ A9EA265D209D4558995C9BD4 /* Resources */ = { isa = PBXGroup; children = ( - A5AAD008CBD84A6CAEB9AC97 /* GTAmericaExp-Bold.otf */, 593541512915C8CF001E81A5 /* ExpensifyNeue-Bold.otf */, 593541522915C8DF001E81A5 /* ExpensifyMono-Bold.otf */, 593541532915C8DF001E81A5 /* ExpensifyMono-Regular.otf */, @@ -222,17 +205,6 @@ 5935414F2915C8CF001E81A5 /* ExpensifyNeue-BoldItalic.otf */, 593541502915C8CF001E81A5 /* ExpensifyNeue-Italic.otf */, 5935414E2915C8CF001E81A5 /* ExpensifyNeue-Regular.otf */, - 67D5C3A6A7FA417C8A853FC1 /* GTAmericaExp-Light.otf */, - AE65058949E14DA5A2D5435D /* GTAmericaExp-Medium.otf */, - 8C7003903C1E4957824899BB /* GTAmericaExp-Regular.otf */, - A292718541C841859D97DF2F /* GTAmericaExp-Thin.otf */, - 8437A5A38F2047E0BCCD7C2F /* GTAmericaExpMono-Rg.otf */, - A8D6F2F722FD4E66A38EBBB6 /* GTAmericaExp-BdIt.otf */, - DB5A1365442D4419AF6F08E5 /* GTAmericaExp-MdIt.otf */, - 918D7FEFF96242E6B5F5E14D /* GTAmericaExp-RgIt.otf */, - 0DE5D096095C41EE96746C9E /* GTAmericaExpMono-Bd.otf */, - 3981452A2C7340EBBA2B9BD1 /* GTAmericaExpMono-BdIt.otf */, - 5150E5D0D7F74DBA8D7C1914 /* GTAmericaExpMono-RgIt.otf */, ); name = Resources; sourceTree = ""; @@ -348,23 +320,19 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 597489E52936B82200AE6F8B /* ExpensifyNeue-Regular.otf in Resources */, + 597489E22936B81C00AE6F8B /* ExpensifyNewKansas-MediumItalic.otf in Resources */, 0F5BE0CE252686330097D869 /* GoogleService-Info.plist in Resources */, + 597489E02936B81600AE6F8B /* ExpensifyMono-Regular.otf in Resources */, E9DF872D2525201700607FDC /* AirshipConfig.plist in Resources */, - 12DD1878FCB9487C9F031C86 /* GTAmericaExpMono-Rg.otf in Resources */, - 1E76D5212522316A005A268F /* GTAmericaExp-Bold.otf in Resources */, - 1E76D5222522316A005A268F /* GTAmericaExp-Light.otf in Resources */, - 1E76D5232522316A005A268F /* GTAmericaExp-Medium.otf in Resources */, - 1E76D5242522316A005A268F /* GTAmericaExp-Regular.otf in Resources */, F0C450EA2705020500FD2970 /* colors.json in Resources */, - 1E76D5252522316A005A268F /* GTAmericaExp-Thin.otf in Resources */, - 425866037F4C482AAB46CB8B /* GTAmericaExp-BdIt.otf in Resources */, - 6856B78873B64C44A92E51DB /* GTAmericaExp-MdIt.otf in Resources */, + 597489E32936B81E00AE6F8B /* ExpensifyNeue-BoldItalic.otf in Resources */, + 597489DF2936B81400AE6F8B /* ExpensifyMono-Bold.otf in Resources */, + 597489E12936B81900AE6F8B /* ExpensifyNewKansas-Medium.otf in Resources */, + 597489E42936B82000AE6F8B /* ExpensifyNeue-Italic.otf in Resources */, + 597489DE2936B81100AE6F8B /* ExpensifyNeue-Bold.otf in Resources */, 0CDA8E37287DD6A0004ECBEC /* Images.xcassets in Resources */, - 8821A238A081483FA947BC4E /* GTAmericaExp-RgIt.otf in Resources */, 70CF6E82262E297300711ADC /* BootSplash.storyboard in Resources */, - 52477A09739546F4814EA25F /* GTAmericaExpMono-Bd.otf in Resources */, - ED814D34526B415CAFA0451E /* GTAmericaExpMono-BdIt.otf in Resources */, - DB77016704074197AB6633BB /* GTAmericaExpMono-RgIt.otf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 65b99635f6a8..e69860274adc 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -83,18 +83,6 @@ ExpensifyNeue-Bold.otf ExpensifyMono-Regular.otf ExpensifyMono-Bold.otf - GTAmericaExp-Bold.otf - GTAmericaExp-Light.otf - GTAmericaExp-Medium.otf - GTAmericaExp-Regular.otf - GTAmericaExp-Thin.otf - GTAmericaExpMono-Rg.otf - GTAmericaExp-BdIt.otf - GTAmericaExp-MdIt.otf - GTAmericaExp-RgIt.otf - GTAmericaExpMono-Bd.otf - GTAmericaExpMono-BdIt.otf - GTAmericaExpMono-RgIt.otf UIBackgroundModes diff --git a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js index c644db26d153..505f896cba56 100755 --- a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js +++ b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js @@ -54,7 +54,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 = {'GTAmericaExp-Regular': fontFamily.EMOJI_TEXT_FONT}; + const fallbackFonts = {'ExpensifyNeue-Regular': fontFamily.EMOJI_TEXT_FONT}; return (