Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Activity: Hide memos/keysend messages and notes when lurker mode is enabled #2782

Merged
merged 3 commits into from
Feb 3, 2025
Merged

Activity: Hide memos/keysend messages and notes when lurker mode is enabled #2782

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
30fd50b
utilize PrivacyUtils.sensitiveValue() to hide memo if lurker mode is …
myxmaster Jan 30, 2025
7be75a0
hide notes too if lurker enabled
myxmaster Jan 30, 2025
362cea9
remove lurkerMode checks because PrivacyUtils.sensitiveValue() handle…
myxmaster Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions views/Activity/Activity.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import {
numberWithCommas,
numberWithDecimals
} from '../../utils/UnitsUtils';
import PrivacyUtils from '../../utils/PrivacyUtils';

import ActivityStore from '../../stores/ActivityStore';
import FiatStore from '../../stores/FiatStore';
Expand Down Expand Up @@ -113,7 +114,9 @@ const ActivityListItem = React.memo(
{keysendMessageOrMemo ? ': ' : ''}
{keysendMessageOrMemo ? (
<Text style={{ fontStyle: 'italic' }}>
{keysendMessageOrMemo}
{PrivacyUtils.sensitiveValue(
keysendMessageOrMemo
)?.toString()}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need to convert to string?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When i don't do it, I get:

No overload matches this call.
  Overload 1 of 2, '(props: TextProps): Text', gave the following error.
    Type 'string | number | Date | undefined' is not assignable to type 'ReactNode'.
      Type 'Date' is not assignable to type 'ReactNode'.
  Overload 2 of 2, '(props: TextProps, context: any): Text', gave the following error.
    Type 'string | number | Date | undefined' is not assignable to type 'ReactNode'.
      Type 'Date' is not assignable to type 'ReactNode'.ts(2769)
Text.d.ts(115, 3): The expected type comes from property 'children' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<Text> & Readonly<TextProps>'
Text.d.ts(115, 3): The expected type comes from property 'children' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes<Text> & Readonly<TextProps>'

I think this is because PrivacyUtils.sensitiveValue() can return string | number | Date | undefined (because of this line: if (!lurkerMode) return input;) and then <Text> would be unhappy about a Date type.

</Text>
) : (
''
Expand All @@ -133,7 +136,9 @@ const ActivityListItem = React.memo(
{keysendMessageOrMemo ? ': ' : ''}
{keysendMessageOrMemo ? (
<Text style={{ fontStyle: 'italic' }}>
{keysendMessageOrMemo}
{PrivacyUtils.sensitiveValue(
keysendMessageOrMemo
)?.toString()}
</Text>
) : (
''
Expand Down Expand Up @@ -301,8 +306,12 @@ const ActivityListItem = React.memo(
ellipsizeMode="tail"
>
{note.length > 150
? `${note.substring(0, 150)}...`
: note}
? `${PrivacyUtils.sensitiveValue(
note.substring(0, 150)
)?.toString()}...`
: PrivacyUtils.sensitiveValue(
note
)?.toString()}
</ListItem.Subtitle>
</View>
)}
Expand Down