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

Show when member was created #4762

Merged
merged 4 commits into from
Feb 8, 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
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ export interface MemberCreatedProps {
}

export const MemberCreated = React.memo(({ member }: MemberCreatedProps) => {
const { entry, createdAt } = member
const block = entry.type === 'genesis' ? { number: 0, timestamp: createdAt } : entry.block

return (
<MemeberCreated>
<MemberCreatedDate>{new Date(member.createdAt).toLocaleDateString('en-GB')}</MemberCreatedDate>
{member.entry && member.entry.type !== 'genesis' && (
<MemberCreatedBlock>{member.entry.block.number} block</MemberCreatedBlock>
)}
<MemberCreatedDate>{new Date(block.timestamp).toLocaleDateString('en-GB')}</MemberCreatedDate>
<MemberCreatedBlock>{block.number.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',')} block</MemberCreatedBlock>
</MemeberCreated>
)
})
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions packages/ui/src/memberships/queries/members.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,20 @@ fragment MemberWithDetailsFields on Membership {
network
}
}
... on MembershipEntryGifted {
membershipGiftedEvent {
createdAt
inBlock
network
}
}
... on MembershipEntryMemberCreated {
memberCreatedEvent {
createdAt
inBlock
network
}
}
... on MembershipEntryGenesis {
phantom
}
Expand Down
12 changes: 11 additions & 1 deletion packages/ui/src/memberships/types/Member.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,17 @@ export type PaidEntry = {
block: Block
}

export type MemberEntry = GenesisEntry | InvitedEntry | PaidEntry
export type GiftedEntry = {
type: 'gifted'
block: Block
}

export type CreatedEntry = {
type: 'created'
block: Block
}

export type MemberEntry = GenesisEntry | InvitedEntry | PaidEntry | GiftedEntry | CreatedEntry
// Temporary fix for: https://github.com/Joystream/pioneer/issues/1493
export type InvitedMember = Member // & { entry: InvitedEntry }

Expand Down
5 changes: 4 additions & 1 deletion packages/ui/src/memberships/types/casting.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,11 @@ const asMemberEntry = (entry: MemberWithDetailsFieldsFragment['entry']): MemberE
return { type: 'paid', block: asBlock(entry.membershipBoughtEvent) }
} else if (entry.__typename === 'MembershipEntryInvited' && entry.memberInvitedEvent) {
return { type: 'invited', block: asBlock(entry.memberInvitedEvent) }
} else if (entry.__typename === 'MembershipEntryGifted' && entry.membershipGiftedEvent) {
return { type: 'gifted', block: asBlock(entry.membershipGiftedEvent) }
} else if (entry.__typename === 'MembershipEntryMemberCreated' && entry.memberCreatedEvent) {
return { type: 'created', block: asBlock(entry.memberCreatedEvent) }
}

return { type: 'genesis' }
}

Expand Down
Loading