-
Notifications
You must be signed in to change notification settings - Fork 25
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
WIP Pending tx style #1210
WIP Pending tx style #1210
Conversation
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.
🙌
@@ -41,7 +41,7 @@ const Complete: React.FC<Props> = ({ | |||
<Translate zh_hant="支持" zh_hans="支持" /> | |||
<b>{` ${recipient.displayName} `}</b> | |||
<br /> | |||
<Translate zh_hant="已經成功送出!" zh_hans="已经成功送出!" /> | |||
<Translate zh_hant="的指令已經送出!" zh_hans="的指令已经送出!" /> |
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've also revised it in another PR, but no problem I'll resolve conflict.
|
||
const isViewerSender = sender && viewer.id === sender.id | ||
|
||
const isAddCredit = purpose === 'addCredit' | ||
const isRefund = purpose === 'refund' | ||
const isDonation = purpose === 'donation' | ||
const isPayout = purpose === 'payout' | ||
const isPending = txState === 'pending' |
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.
We also need states canceled
and failed
for payout.
@@ -20,7 +20,9 @@ const ME_TRANSACTIONS = gql` | |||
viewer { | |||
id | |||
wallet { | |||
transactions(input: { first: 20, after: $after, states: succeeded }) { | |||
transactions( | |||
input: { first: 20, after: $after, states: [succeeded, pending] } |
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.
We also need canceled
and failed
.
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.
Moved to discussion on slack 😄 https://mattersnews.slack.com/archives/G88CK7Q7L/p1592264702011400?thread_ts=1592015685.006100&cid=G88CK7Q7L
We can also merge this one first if it's blocking this one: thematters/matters-server#1165 (review) I can add error state in a separate PR.
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.
No prob. 👌🏻
Codecov Report
@@ Coverage Diff @@
## develop #1210 +/- ##
========================================
Coverage 90.00% 90.00%
========================================
Files 1 1
Lines 10 10
Branches 2 2
========================================
Hits 9 9
Misses 1 1 Continue to review full report at Codecov.
|
Update modal text and add style for pending transactions.