From 93b57b5a165b8fac57ba6813c6d2326e6cd1401c Mon Sep 17 00:00:00 2001 From: Alex Beaman Date: Mon, 6 Nov 2023 08:49:10 +0200 Subject: [PATCH 1/3] Make lint happy --- src/styles/fontFamily/multiFontFamily.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/styles/fontFamily/multiFontFamily.ts b/src/styles/fontFamily/multiFontFamily.ts index 14f64d406954..f3ad9ba80d44 100644 --- a/src/styles/fontFamily/multiFontFamily.ts +++ b/src/styles/fontFamily/multiFontFamily.ts @@ -1,7 +1,7 @@ import {multiBold} from './bold'; import FontFamilyStyles from './types'; -import CONST from '../../CONST'; -import getOperatingSystem from '../../libs/getOperatingSystem'; +import CONST from'@src/CONST' +import getOperatingSystem from '@libs/getOperatingSystem' // 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 From 8c8448abc12bdd0e9c66a1d7a54db4c0e0e0ae3d Mon Sep 17 00:00:00 2001 From: Alex Beaman Date: Mon, 6 Nov 2023 08:50:35 +0200 Subject: [PATCH 2/3] Update import order --- src/styles/fontFamily/multiFontFamily.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/styles/fontFamily/multiFontFamily.ts b/src/styles/fontFamily/multiFontFamily.ts index f3ad9ba80d44..d516fa4fad20 100644 --- a/src/styles/fontFamily/multiFontFamily.ts +++ b/src/styles/fontFamily/multiFontFamily.ts @@ -1,7 +1,7 @@ -import {multiBold} from './bold'; -import FontFamilyStyles from './types'; import CONST from'@src/CONST' import getOperatingSystem from '@libs/getOperatingSystem' +import FontFamilyStyles from './types'; +import {multiBold} 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 From 374e876d4a911baa8e695c8a02315c626c8f1eda Mon Sep 17 00:00:00 2001 From: Alex Beaman Date: Mon, 6 Nov 2023 08:55:43 +0200 Subject: [PATCH 3/3] Prettier wanted import order changed? --- src/styles/fontFamily/multiFontFamily.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/styles/fontFamily/multiFontFamily.ts b/src/styles/fontFamily/multiFontFamily.ts index d516fa4fad20..5bd89e0d4bcb 100644 --- a/src/styles/fontFamily/multiFontFamily.ts +++ b/src/styles/fontFamily/multiFontFamily.ts @@ -1,7 +1,7 @@ -import CONST from'@src/CONST' -import getOperatingSystem from '@libs/getOperatingSystem' -import FontFamilyStyles from './types'; +import getOperatingSystem from '@libs/getOperatingSystem'; +import CONST from '@src/CONST'; import {multiBold} from './bold'; +import FontFamilyStyles from './types'; // 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