From 18945da8288b35911f21f22a86c7b4ed55b686b8 Mon Sep 17 00:00:00 2001 From: Georgia Monahan Date: Fri, 3 Nov 2023 08:12:15 +0000 Subject: [PATCH 1/3] Use ternary instead due to empty string --- src/styles/StyleUtils.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/styles/StyleUtils.ts b/src/styles/StyleUtils.ts index faece4f44335..60c47838e5d1 100644 --- a/src/styles/StyleUtils.ts +++ b/src/styles/StyleUtils.ts @@ -273,7 +273,8 @@ function getDefaultWorkspaceAvatarColor(workspaceName: string): ViewStyle { * Helper method to return eReceipt color code */ function getEReceiptColorCode(transaction: Transaction): EReceiptColorName { - const transactionID = transaction.parentTransactionID ?? transaction.transactionID ?? ''; + const parentTransactionID = transaction.parentTransactionID || ""; + const transactionID = parentTransactionID ? parentTransactionID : transaction.transactionID || ""; const colorHash = UserUtils.hashText(transactionID.trim(), eReceiptColors.length); From f9e55337716941e1133b5ee7dd07258055f67747 Mon Sep 17 00:00:00 2001 From: Georgia Monahan Date: Fri, 3 Nov 2023 08:38:49 +0000 Subject: [PATCH 2/3] prettier --- src/styles/StyleUtils.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/styles/StyleUtils.ts b/src/styles/StyleUtils.ts index 60c47838e5d1..94a4dee3e2cd 100644 --- a/src/styles/StyleUtils.ts +++ b/src/styles/StyleUtils.ts @@ -273,8 +273,8 @@ function getDefaultWorkspaceAvatarColor(workspaceName: string): ViewStyle { * Helper method to return eReceipt color code */ function getEReceiptColorCode(transaction: Transaction): EReceiptColorName { - const parentTransactionID = transaction.parentTransactionID || ""; - const transactionID = parentTransactionID ? parentTransactionID : transaction.transactionID || ""; + const parentTransactionID = transaction.parentTransactionID || ''; + const transactionID = parentTransactionID ? parentTransactionID : transaction.transactionID || ''; const colorHash = UserUtils.hashText(transactionID.trim(), eReceiptColors.length); From bfdb1323b1df123ae82b74b27c9155d45f7cd256 Mon Sep 17 00:00:00 2001 From: Georgia Monahan Date: Fri, 3 Nov 2023 09:11:35 +0000 Subject: [PATCH 3/3] es-lint --- src/styles/StyleUtils.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/styles/StyleUtils.ts b/src/styles/StyleUtils.ts index 94a4dee3e2cd..120230d88e58 100644 --- a/src/styles/StyleUtils.ts +++ b/src/styles/StyleUtils.ts @@ -273,8 +273,8 @@ function getDefaultWorkspaceAvatarColor(workspaceName: string): ViewStyle { * Helper method to return eReceipt color code */ function getEReceiptColorCode(transaction: Transaction): EReceiptColorName { - const parentTransactionID = transaction.parentTransactionID || ''; - const transactionID = parentTransactionID ? parentTransactionID : transaction.transactionID || ''; + // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing + const transactionID = transaction.parentTransactionID || transaction.transactionID || ''; const colorHash = UserUtils.hashText(transactionID.trim(), eReceiptColors.length);