This repository has been archived by the owner on May 13, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 136
Adds Add Funds button to the notification #482
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -83,7 +83,17 @@ export interface ActionWallet { | |
testId?: string | ||
} | ||
|
||
export type NotificationType = 'ads' | 'ads-launch' | 'backupWallet' | 'contribute' | 'grant' | 'insufficientFunds' | 'tipsProcessed' | 'error' | '' | ||
export type NotificationType = | ||
'ads' | | ||
'ads-launch' | | ||
'backupWallet' | | ||
'contribute' | | ||
'grant' | | ||
'insufficientFunds' | | ||
'tipsProcessed' | | ||
'error' | | ||
'pendingContribution' | | ||
'' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I know this is just alignment mod but do we need the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. isn't default case right for this use case, when you have empty string as type can't be null |
||
|
||
export interface Notification { | ||
id: string | ||
|
@@ -264,6 +274,10 @@ export default class WalletWrapper extends React.PureComponent<Props, State> { | |
buttonText = getLocale('backupNow') | ||
buttonAction = this.onNotificationClick | ||
break | ||
case 'insufficientFunds': | ||
buttonText = getLocale('addFunds') | ||
buttonAction = this.onNotificationClick | ||
break | ||
default: | ||
buttonText = getLocale('ok').toUpperCase() | ||
break | ||
|
@@ -289,8 +303,8 @@ export default class WalletWrapper extends React.PureComponent<Props, State> { | |
|
||
return ( | ||
<> | ||
<StyledNotificationCloseIcon> | ||
<CloseCircleOIcon onClick={onClose} /> | ||
<StyledNotificationCloseIcon data-test-id={'notification-close'} onClick={onClose}> | ||
<CloseCircleOIcon /> | ||
</StyledNotificationCloseIcon> | ||
<StyledNotificationContent> | ||
{this.getNotificationIcon(notification)} | ||
|
@@ -323,6 +337,7 @@ export default class WalletWrapper extends React.PureComponent<Props, State> { | |
break | ||
case 'contribute': | ||
case 'tipsProcessed': | ||
case 'pendingContribution': | ||
icon = loveIconUrl | ||
break | ||
case 'grant': | ||
|
@@ -370,6 +385,9 @@ export default class WalletWrapper extends React.PureComponent<Props, State> { | |
case 'tipsProcessed': | ||
typeText = getLocale('contributionTips') | ||
break | ||
case 'pendingContribution': | ||
typeText = getLocale('pendingContributionTitle') | ||
break | ||
default: | ||
typeText = '' | ||
break | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are you going to need this across the other instances or just the "clickable"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it's just so that I can trigger a click