Skip to content

Commit

Permalink
chore: enhance the graph
Browse files Browse the repository at this point in the history
- Fix the logic for app call graph where an app can send/receive transactions on behalf of accounts
- Refactor the graph code into a feature
  • Loading branch information
PatrickDinh authored Jun 13, 2024
1 parent 962ec5f commit 420772f
Show file tree
Hide file tree
Showing 31 changed files with 1,575 additions and 1,078 deletions.
2 changes: 1 addition & 1 deletion src/features/assets/components/asset-link.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { PropsWithChildren, useCallback } from 'react'
import { AssetSummary } from '../models'
import { AsyncMaybeAtom } from '@/features/common/data/types'
import { RenderInlineAsyncAtom } from '@/features/common/components/render-inline-async-atom'
import { CopyButton } from '@/features/common/components/copy-button.tsx'
import { CopyButton } from '@/features/common/components/copy-button'
import { toast } from 'react-toastify'

type CommonProps = {
Expand Down
2 changes: 1 addition & 1 deletion src/features/common/components/copy-button.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { CopyIcon } from 'lucide-react'
import { Button } from './button'
import { cn } from '@/features/common/utils.ts'
import { cn } from '@/features/common/utils'

type Props = {
onClick: () => void
Expand Down
2 changes: 1 addition & 1 deletion src/features/explore/pages/explore-page.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { executeComponentTest } from '@/tests/test-component'
import { getAllByRole, getByRole, queryAllByRole, render, waitFor } from '@/tests/testing-library'
import { Atom, createStore } from 'jotai'
import { describe, expect, it } from 'vitest'
import { ExplorePage } from './explore-page.tsx'
import { ExplorePage } from './explore-page'
import { latestBlocksTitle } from '@/features/blocks/components/latest-blocks'
import { latestTransactionsTitle } from '@/features/transactions/components/latest-transactions'
import { blockResultsAtom, syncedRoundAtom } from '@/features/blocks/data'
Expand Down
2 changes: 1 addition & 1 deletion src/features/groups/components/group-details.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ export function GroupDetails({ group }: Props) {
<Card className={cn('p-4')}>
<CardContent className={cn('text-sm space-y-2')}>
<h1 className={cn('text-2xl text-primary font-bold')}>{transactionsLabel}</h1>
<GroupTransactionsViewTabs group={group} />
</CardContent>
<GroupTransactionsViewTabs group={group} />
</Card>
</div>
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import { cn } from '@/features/common/utils'
import { OverflowAutoTabsContent, Tabs, TabsList, TabsTrigger } from '@/features/common/components/tabs'
import { Group } from '../models'
import { TransactionsGraph } from '@/features/transactions/components/transactions-graph'
import { TransactionsGraph } from '@/features/transactions-graph'
import { TransactionsTable } from '@/features/transactions/components/transactions-table'
import { transactionsTableColumnsWithoutRound } from '@/features/transactions/components/transactions-table-columns'
import { useMemo } from 'react'
import { asTransactionsGraphData } from '@/features/transactions-graph/mappers'

type Props = {
group: Group
Expand All @@ -16,6 +18,8 @@ export const groupVisualGraphLabel = 'Graph'
export const groupVisualTableLabel = 'Table'

export function GroupTransactionsViewTabs({ group }: Props) {
const transactionsGraph = useMemo(() => asTransactionsGraphData(group.transactions), [group.transactions])

return (
<Tabs defaultValue={graphTabId}>
<TabsList aria-label={groupVisual}>
Expand All @@ -27,7 +31,7 @@ export function GroupTransactionsViewTabs({ group }: Props) {
</TabsTrigger>
</TabsList>
<OverflowAutoTabsContent value={graphTabId}>
<TransactionsGraph transactions={group.transactions} />
<TransactionsGraph transactionsGraphData={transactionsGraph} />
</OverflowAutoTabsContent>
<OverflowAutoTabsContent value={tableTabId}>
<TransactionsTable transactions={group.transactions} columns={transactionsTableColumnsWithoutRound} subRowsExpanded={false} />
Expand Down
2 changes: 1 addition & 1 deletion src/features/search/components/search.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { useSearch } from '../data'
import { Loader } from 'lucide-react'
import { Badge } from '@/features/common/components/badge'
import { useLocationChange } from '@/features/common/hooks/use-location-change'
import { isMacOs } from '@/utils/is-mac-platform.ts'
import { isMacOs } from '@/utils/is-mac-platform'

export const searchPlaceholderLabel = `Search by ID or Address ${isMacOs ? '(⌘K)' : '(Ctrl+K)'}`
export const noSearchResultsMessage = 'No results.'
Expand Down
Loading

0 comments on commit 420772f

Please sign in to comment.