-
Notifications
You must be signed in to change notification settings - Fork 13
Feat/request pots #1332
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
Merged
Merged
Feat/request pots #1332
Changes from all commits
Commits
Show all changes
32 commits
Select commit
Hold shift + click to select a range
8ea6e7d
feat: add progress bar component
Zishan-7 fce6615
feat: add contributors
Zishan-7 7fc1619
feat: create request page changes
Zishan-7 a4e5d77
feat: txn card changes
Zishan-7 062f946
feat: add slider
Zishan-7 0cb620c
feat: add initial requ fulfilment screen
Zishan-7 15bc994
feat: update slider component
Zishan-7 74d64ef
refactor: change request api to use jwt token
jjramirezn 3aff788
Update src/services/requests.ts
jjramirezn 06625ff
feat: remove direct request
Zishan-7 122c9c9
Merge remote-tracking branch 'origin/peanut-wallet-dev' into feat/req…
Zishan-7 db3291d
feat: update request creation process
Zishan-7 e5e7953
Merge pull request #1328 from peanutprotocol/feat/request-pots-datamodel
jjramirezn 9d7331f
feat: update request fulfilment flow to handle request pots
Zishan-7 ea5c11f
feat: receipt changes
Zishan-7 e7a50c7
feat: changes required for open requests
Zishan-7 b3451dc
feat: txn receipt changes
Zishan-7 7bcf5a2
feat: history changes
Zishan-7 669162c
fix: txn receipts
Zishan-7 04f390f
Fix: minor UI changes
Zishan-7 5e0058a
Merge remote-tracking branch 'origin/peanut-wallet-dev' into feat/req…
Zishan-7 666e3a3
refactor: use explicit type import for ChargeEntry in history.utils.ts
Zishan-7 92facb2
refactor: use explicit type imports for Payment and ChargeEntry in Co…
Zishan-7 4d6db97
fix: update transaction status logic to treat zero total amount as ca…
Zishan-7 139bc4f
request fulfillment page final changes
Zishan-7 6468c92
fix: cr suggestions
Zishan-7 07149b8
fix: update amount handling for request pot payments in PaymentForm
Zishan-7 f9dd883
fix: nitpicks
Zishan-7 93e4a09
Merge remote-tracking branch 'origin/peanut-wallet-dev' into feat/req…
Zishan-7 fcfefbb
fix: name
Zishan-7 5ccac6e
feat: add bill split params
Zishan-7 7bc99ec
feat: add bill split button for QR payments
Zishan-7 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 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 was deleted.
Oops, something went wrong.
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| import { type Payment } from '@/services/services.types' | ||
| import Card, { type CardPosition } from '../Card' | ||
| import AvatarWithBadge from '@/components/Profile/AvatarWithBadge' | ||
| import { getColorForUsername } from '@/utils/color.utils' | ||
| import { VerifiedUserLabel } from '@/components/UserHeader' | ||
| import { formatTokenAmount } from '@/utils' | ||
| import { isAddress } from 'viem' | ||
|
|
||
| export type Contributor = { | ||
| uuid: string | ||
| payments: Payment[] | ||
| amount: string | ||
| username: string | undefined | ||
| fulfillmentPayment: Payment | null | ||
| isUserVerified: boolean | ||
| } | ||
|
|
||
| const ContributorCard = ({ contributor, position }: { contributor: Contributor; position: CardPosition }) => { | ||
| const colors = getColorForUsername(contributor.username ?? '') | ||
| const isEvmAddress = isAddress(contributor.username ?? '') | ||
| return ( | ||
| <Card position={position} className="cursor-pointer"> | ||
| <div className="flex items-center justify-between"> | ||
| <div className="flex items-center gap-2"> | ||
| <AvatarWithBadge | ||
| name={contributor.username ?? ''} | ||
| size={'extra-small'} | ||
| inlineStyle={{ backgroundColor: isEvmAddress ? '#FFC900' : colors.lightShade }} | ||
| textColor={isEvmAddress ? '#000000' : colors.darkShade} | ||
| icon={isEvmAddress ? 'wallet-outline' : undefined} | ||
| /> | ||
|
|
||
| <VerifiedUserLabel | ||
| username={contributor.username ?? ''} | ||
| name={contributor.username ?? ''} | ||
| isVerified={contributor.isUserVerified} | ||
| /> | ||
| </div> | ||
|
|
||
| <p className="font-medium">${formatTokenAmount(Number(contributor.amount))}</p> | ||
| </div> | ||
| </Card> | ||
| ) | ||
| } | ||
|
|
||
| export default ContributorCard |
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.