feat: transaction text prop #471
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -48,9 +48,10 @@ export interface WidgetContainerProps | |
| disableAltpayment?: boolean | ||
| contributionOffset?: number | ||
| disableSound?: boolean | ||
| transactionText?: string | ||
| } | ||
|
|
||
| const snackbarOptionsSuccess: OptionsObject = { | ||
| variant: 'success', | ||
| autoHideDuration: 8000, | ||
| anchorOrigin: { | ||
|
|
@@ -59,6 +60,14 @@ const snackbarOptions: OptionsObject = { | |
| }, | ||
| }; | ||
|
|
||
| const snackbarOptionsInfo: OptionsObject = { | ||
| autoHideDuration: 8000, | ||
| anchorOrigin: { | ||
| vertical: 'bottom', | ||
| horizontal: 'center', | ||
| }, | ||
| }; | ||
|
|
||
| export interface Output { | ||
| index: number; | ||
| value: number; | ||
|
|
@@ -109,6 +118,7 @@ export const WidgetContainer: React.FunctionComponent<WidgetContainerProps> = | |
| disableAltpayment, | ||
| contributionOffset, | ||
| disableSound, | ||
| transactionText, | ||
| ...widgetProps | ||
| } = props; | ||
|
|
||
|
|
@@ -158,6 +168,7 @@ export const WidgetContainer: React.FunctionComponent<WidgetContainerProps> = | |
| } else { | ||
| const expectedAmount = amount ? resolveNumber(amount) : undefined; | ||
| const receivedAmount = resolveNumber(transaction.amount); | ||
| const currencyTicker = getCurrencyTypeFromAddress(to); | ||
|
|
||
| if (await shouldTriggerOnSuccess( | ||
| transaction, | ||
|
|
@@ -177,13 +188,12 @@ export const WidgetContainer: React.FunctionComponent<WidgetContainerProps> = | |
| txSound.play().catch(() => {}); | ||
| } | ||
|
|
||
| if (!hideToasts) | ||
| enqueueSnackbar( | ||
| `${ | ||
| successText ? successText + ' | ' : '' | ||
| }Received ${receivedAmount} ${currencyTicker}`, | ||
| snackbarOptionsSuccess, | ||
| ); | ||
| setSuccess(true); | ||
| onSuccess?.(transaction); | ||
|
|
@@ -192,6 +202,15 @@ export const WidgetContainer: React.FunctionComponent<WidgetContainerProps> = | |
| }, 3000); | ||
| } else { | ||
| onTransaction?.(transaction); | ||
| if (transactionText){ | ||
| enqueueSnackbar( | ||
| `${ | ||
| transactionText ? transactionText : 'New transaction' | ||
| } | Received ${receivedAmount} ${currencyTicker}`, | ||
| snackbarOptionsInfo, | ||
| ); | ||
| } | ||
|
Member
There was a problem hiding this comment. I wasn't really expecting this... I think it's better to stick with the standard toast and perhaps we can make a new task to better differentiate them so people don't mistakenly think they paid the full correct amount when they did not.
Member
There was a problem hiding this comment. On second thought - @chedieck thoughts on this? Maybe John also has some ideas how best to visually communicate the custom message while also making it clear that less than the full amount was paid.
Collaborator
There was a problem hiding this comment. Maybe call it "Unexpected payment" or something like that by default? Probably some other more precise adjective would be better. As for the PR, this |
||
|
|
||
| } | ||
| } | ||
| setNewTxs([]); | ||
|
|
@@ -286,6 +305,7 @@ export const WidgetContainer: React.FunctionComponent<WidgetContainerProps> = | |
| setShiftCompleted={setShiftCompleted} | ||
| disableAltpayment={disableAltpayment} | ||
| contributionOffset={contributionOffset} | ||
| transactionText={transactionText} | ||
| /> | ||
| </React.Fragment> | ||
| ); | ||
|
|
||
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.
I don't think this should be set by default.
Let's keep the old behaviour (of no toast) if it's not set.
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 is already set to only trigger the toast if there is a transaction text set