From 362cea9e5263c51e784be05cf71dab733a3e37d1 Mon Sep 17 00:00:00 2001 From: myxmaster Date: Thu, 30 Jan 2025 13:13:42 +0100 Subject: [PATCH] remove lurkerMode checks because PrivacyUtils.sensitiveValue() handles it internally already --- views/Activity/Activity.tsx | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/views/Activity/Activity.tsx b/views/Activity/Activity.tsx index 6ca6e6c0b4..db9ef297dd 100644 --- a/views/Activity/Activity.tsx +++ b/views/Activity/Activity.tsx @@ -81,7 +81,6 @@ interface ActivityListItemProps { | 'warning' | 'warningReserve'; order?: Order; - lurkerMode: boolean; } const ActivityListItem = React.memo( @@ -90,8 +89,7 @@ const ActivityListItem = React.memo( selectedPaymentForOrder, onItemPress, getRightTitleTheme, - order, - lurkerMode + order }: ActivityListItemProps) => { const note = item.getNote; let displayName = item.model; @@ -116,11 +114,9 @@ const ActivityListItem = React.memo( {keysendMessageOrMemo ? ': ' : ''} {keysendMessageOrMemo ? ( - {lurkerMode - ? PrivacyUtils.sensitiveValue( - keysendMessageOrMemo - )?.toString() - : keysendMessageOrMemo} + {PrivacyUtils.sensitiveValue( + keysendMessageOrMemo + )?.toString()} ) : ( '' @@ -140,11 +136,9 @@ const ActivityListItem = React.memo( {keysendMessageOrMemo ? ': ' : ''} {keysendMessageOrMemo ? ( - {lurkerMode - ? PrivacyUtils.sensitiveValue( - keysendMessageOrMemo - )?.toString() - : keysendMessageOrMemo} + {PrivacyUtils.sensitiveValue( + keysendMessageOrMemo + )?.toString()} ) : ( '' @@ -311,13 +305,13 @@ const ActivityListItem = React.memo( }} ellipsizeMode="tail" > - {lurkerMode - ? PrivacyUtils.sensitiveValue( + {note.length > 150 + ? `${PrivacyUtils.sensitiveValue( + note.substring(0, 150) + )?.toString()}...` + : PrivacyUtils.sensitiveValue( note - )?.toString() - : note.length > 150 - ? `${note.substring(0, 150)}...` - : note} + )?.toString()} )} @@ -459,7 +453,6 @@ export default class Activity extends React.PureComponent< const { filteredActivity, getActivityAndFilter } = ActivityStore; const { recordPayment } = PosStore; const { settings } = SettingsStore; - const lurkerMode = settings.privacy.lurkerMode || false; const { fiat } = settings; const order = route.params?.order; @@ -625,7 +618,6 @@ export default class Activity extends React.PureComponent< onItemPress={this.handleItemPress} getRightTitleTheme={this.getRightTitleTheme} order={route.params?.order} - lurkerMode={lurkerMode} /> )} keyExtractor={(item, index) => `${item.model}-${index}`}