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.

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

Don't show "tip not sent with comment" warning, when it's sent with a tip #3180

Merged
merged 1 commit into from
Nov 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions ui/component/commentCreate/view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -787,6 +787,7 @@ export function CommentCreate(props: Props) {
setDisableSubmitButton={setDisableReviewButton}
setTipError={setTipError}
tipError={tipError}
isComment
/>
)}

Expand Down
3 changes: 3 additions & 0 deletions ui/component/walletTipAmountSelector/view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ type Props = {
tipError: string,
uri: string,
canReceiveFiatTips: ?boolean,
isComment?: boolean,
onChange: (number) => void,
setConvertedAmount?: (number) => void,
setDisableSubmitButton: (boolean) => void,
Expand All @@ -49,6 +50,7 @@ function WalletTipAmountSelector(props: Props) {
fiatConversion,
tipError,
canReceiveFiatTips,
isComment,
onChange,
setConvertedAmount,
setDisableSubmitButton,
Expand Down Expand Up @@ -275,6 +277,7 @@ function WalletTipAmountSelector(props: Props) {
? getHelpMessage(__('Only creators that verify cash accounts can receive tips.'))
: getHelpMessage(__('Send a tip directly from your attached card.')))}
{activeTab === TAB_FIAT &&
!isComment &&
getHelpMessage(
__(
'IMPORTANT: this donation is sent without a comment. If you want to include a comment, click the $ next to the comment input area.'
Expand Down
Loading