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

CentrifugeApp: Portfolio transaction table #1605

Merged
merged 40 commits into from
Oct 30, 2023
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
f3cde6c
Update transaction table styles and data fetching
sophialittlejohn Sep 27, 2023
17eab72
Filter transaction types for short table
sophialittlejohn Sep 27, 2023
9e6e567
Update styles in tx history page
sophialittlejohn Sep 27, 2023
d9e3cf8
Addsort buttons to table and view all button
sophialittlejohn Sep 28, 2023
532062d
Add count and txTypes to cent-js
sophialittlejohn Sep 28, 2023
3dff2a0
Create new history page
sophialittlejohn Sep 29, 2023
f8ae576
Remove old file
sophialittlejohn Sep 29, 2023
2689edc
Merge branch 'main' into cent-app/portfolio-transaction-table
hieronx Oct 2, 2023
1b78717
Merge branch 'main' of github.com:centrifuge/apps into cent-app/portf…
sophialittlejohn Oct 10, 2023
e34d67c
Add pagination
sophialittlejohn Oct 10, 2023
26f28f1
Resolve unique key error
sophialittlejohn Oct 13, 2023
67900c2
Fetch currencies once per poolId
sophialittlejohn Oct 13, 2023
8d10135
Merge branch 'main' into cent-app/portfolio-transaction-table
sophialittlejohn Oct 13, 2023
87dd3e8
Add CSV export
sophialittlejohn Oct 13, 2023
b56b861
Hide download button in preview
sophialittlejohn Oct 13, 2023
058368a
Merge branch 'main' into cent-app/portfolio-transaction-table
sophialittlejohn Oct 16, 2023
cad7795
Fix logs
sophialittlejohn Oct 16, 2023
afebaf3
Merge branch 'cent-app/portfolio-transaction-table' of github.com:cen…
sophialittlejohn Oct 16, 2023
0adadef
Merge branch 'main' of github.com:centrifuge/apps into cent-app/portf…
sophialittlejohn Oct 20, 2023
35db8ff
Add more query keys
sophialittlejohn Oct 20, 2023
f445227
Add loading state and internal link
sophialittlejohn Oct 23, 2023
176bbd0
Improve load time
sophialittlejohn Oct 23, 2023
1ebce79
Add loop ids
sophialittlejohn Oct 23, 2023
e505fff
Merge branch 'main' of github.com:centrifuge/apps into cent-app/portf…
sophialittlejohn Oct 25, 2023
2bf06e4
Fix table rendering
sophialittlejohn Oct 25, 2023
0f16c50
Merge branch 'main' of github.com:centrifuge/apps into cent-app/portf…
sophialittlejohn Oct 27, 2023
96f5f36
Restructure files
sophialittlejohn Oct 27, 2023
fe1c47e
Add pagination and csv export to DataTable
sophialittlejohn Oct 27, 2023
fc56eb1
Use DataTable for transactions
sophialittlejohn Oct 27, 2023
84efc6b
Add title to tx table
sophialittlejohn Oct 27, 2023
d5e8ad1
Convert invested token table to new style
sophialittlejohn Oct 27, 2023
5791310
Adjust percision and table width
sophialittlejohn Oct 27, 2023
7ee615a
Fix border
sophialittlejohn Oct 27, 2023
91bd04b
Fix linting
sophialittlejohn Oct 27, 2023
c34aeaa
Fix pool list key
sophialittlejohn Oct 27, 2023
59fa110
Clean up
sophialittlejohn Oct 27, 2023
f78c808
Lint fix
sophialittlejohn Oct 27, 2023
076a915
refactor
onnovisser Oct 30, 2023
38f9ef2
cleanup
onnovisser Oct 30, 2023
f185db4
Merge commit 'b973b1de7c359182ad994c86fbac88a9eccf3a7a' into cent-app…
onnovisser Oct 30, 2023
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
8 changes: 8 additions & 0 deletions centrifuge-app/src/components/Menu/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {
Box,
IconClock,
IconInvestments,
IconNft,
IconPieChart,
Expand Down Expand Up @@ -54,6 +55,13 @@ export function Menu() {
</PageLink>
)}

{showPortfolio && address && (
<PageLink to="/history" stacked={!isLarge}>
<IconClock />
History
</PageLink>
)}

{(pools.length > 0 || config.poolCreationType === 'immediate') && (
<IssuerMenu defaultOpen={isLarge} stacked={!isLarge}>
{isLarge ? (
Expand Down
25 changes: 12 additions & 13 deletions centrifuge-app/src/components/Portfolio/TransactionTypeChip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,21 @@ import * as React from 'react'
import { TransactionCardProps } from './Transactions'

type TransactionTypeProps = {
type: TransactionCardProps['action']
type: TransactionCardProps['type']
}

// @ts-expect-error
const states: {
[Key in TransactionCardProps['action']]: {
[Key in TransactionCardProps['type']]: {
label: string
status: StatusChipProps['status']
}
} = {
PENDING_ORDER: {
label: 'Pending order',
status: 'default',
},
INVEST_ORDER_UPDATE: {
label: 'Invest order update',
label: 'Invest order placed',
status: 'default',
},
REDEEM_ORDER_UPDATE: {
label: 'Redeem order update',
label: 'Redeem order placed',
status: 'default',
},
INVEST_ORDER_CANCEL: {
Expand All @@ -34,12 +29,12 @@ const states: {
status: 'default',
},
INVEST_EXECUTION: {
label: 'Invest execution',
status: 'default',
label: 'Invest executed',
status: 'ok',
},
REDEEM_EXECUTION: {
label: 'Redeem execution',
status: 'default',
label: 'Redeem executed',
status: 'info',
},
TRANSFER_IN: {
label: 'Transfer in',
Expand Down Expand Up @@ -73,6 +68,10 @@ const states: {
label: 'Closed',
status: 'default',
},
PRICED: {
label: 'Priced',
status: 'default',
},
}

export function TransactionTypeChip({ type }: TransactionTypeProps) {
Expand Down
Loading
Loading