Skip to content

Commit

Permalink
feat: feedback messages in user nodes tables
Browse files Browse the repository at this point in the history
  • Loading branch information
amalcaraz committed Dec 11, 2023
1 parent 418baec commit c6cdd8f
Show file tree
Hide file tree
Showing 6 changed files with 71 additions and 42 deletions.
33 changes: 21 additions & 12 deletions src/components/pages/earn/ComputeResourceNodesPage/cmp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -142,18 +142,27 @@ export const ComputeResourceNodesPage = memo((props) => {
{selectedTab === 'user' ? (
<>
{nodes && filteredUserNodes && (
<ComputeResourceNodesTable
{...{
nodes,
filteredNodes: filteredUserNodes,
nodesIssues: userNodesIssues,
userNode,
account,
lastVersion,
handleLink,
handleUnlink,
}}
/>
<>
<ComputeResourceNodesTable
{...{
nodes,
filteredNodes: filteredUserNodes,
nodesIssues: userNodesIssues,
userNode,
account,
lastVersion,
handleLink,
handleUnlink,
}}
/>
<div tw="my-10 mx-4 text-center opacity-60">
{!account
? 'Connect your wallet to see your compute node running.'
: !userNodes?.length
? 'You have no compute node running.'
: ''}
</div>
</>
)}
</>
) : (
Expand Down
25 changes: 17 additions & 8 deletions src/components/pages/earn/CoreChannelNodesPage/cmp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,23 @@ export const CoreChannelNodesPage = memo((props) => {
{selectedTab === 'user' ? (
<>
{nodes && filteredUserNodes && (
<CoreChannelNodesTable
{...{
nodes,
filteredNodes: filteredUserNodes,
nodesIssues: userNodesIssues,
lastVersion,
}}
/>
<>
<CoreChannelNodesTable
{...{
nodes,
filteredNodes: filteredUserNodes,
nodesIssues: userNodesIssues,
lastVersion,
}}
/>
<div tw="my-10 mx-4 text-center opacity-60">
{!account
? 'Connect your wallet to see your core node running.'
: !userNodes?.length
? 'You have no core node running.'
: ''}
</div>
</>
)}
</>
) : (
Expand Down
38 changes: 25 additions & 13 deletions src/components/pages/earn/StakingPage/cmp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export const StakingPage = memo((props) => {
accountBalance,
nodes,
filteredNodes,
stakeNodes,
filteredStakeNodes,
tabs,
selectedTab,
Expand Down Expand Up @@ -110,19 +111,30 @@ export const StakingPage = memo((props) => {
<>
{selectedTab === 'user' ? (
<>
{nodes && filteredStakeNodes && (
<StakingNodesTable
{...{
nodes,
filteredNodes: filteredStakeNodes,
accountBalance,
account,
handleStake,
handleUnstake,
showStakedAmount: true,
nodesIssues,
}}
/>
{nodes && filteredStakeNodes ? (
<>
<StakingNodesTable
{...{
nodes,
filteredNodes: filteredStakeNodes,
accountBalance,
account,
handleStake,
handleUnstake,
showStakedAmount: true,
nodesIssues,
}}
/>
<div tw="my-10 mx-4 text-center opacity-60">
{!account
? 'Connect your wallet to see your stakes.'
: !stakeNodes?.length
? 'You are not staking.'
: ''}
</div>
</>
) : (
<>No data</>
)}
</>
) : (
Expand Down
5 changes: 2 additions & 3 deletions src/hooks/pages/earn/useComputeResourceNodesPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,10 @@ export function useComputeResourceNodesPage(

const tabs = useMemo(() => {
const tabs: TabsProps['tabs'] = [
{ id: 'nodes', name: 'All compute nodes' },
{
id: 'user',
name: 'My compute nodes',
disabled: !userNodes?.length,
label: userNodesWarningFlag
? {
label: (
Expand All @@ -107,11 +107,10 @@ export function useComputeResourceNodesPage(
}
: undefined,
},
{ id: 'nodes', name: 'All compute nodes' },
]

return tabs
}, [userNodes, userNodesWarningFlag])
}, [userNodesWarningFlag])

// ----------------------------- FILTERED NODES

Expand Down
5 changes: 2 additions & 3 deletions src/hooks/pages/earn/useCoreChannelNodesPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@ export function useCoreChannelNodesPage(

const tabs = useMemo(() => {
const tabs: TabsProps['tabs'] = [
{ id: 'nodes', name: 'All core nodes' },
{
id: 'user',
name: 'My core nodes',
disabled: !userNodes?.length,
label: userNodesWarningFlag
? {
label: (
Expand All @@ -75,11 +75,10 @@ export function useCoreChannelNodesPage(
}
: undefined,
},
{ id: 'nodes', name: 'All core nodes' },
]

return tabs
}, [userNodes, userNodesWarningFlag])
}, [userNodesWarningFlag])

// -----------------------------

Expand Down
7 changes: 4 additions & 3 deletions src/hooks/pages/earn/useStakingPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export type UseStakingPageProps = {
}

export type UseStakingPageReturn = UseCoreChannelNodesReturn & {
stakeNodes?: CCN[]
filteredStakeNodes?: CCN[]
selectedTab: string
tabs: TabsProps['tabs']
Expand Down Expand Up @@ -89,22 +90,21 @@ export function useStakingPage(

const tabs = useMemo(() => {
const tabs: TabsProps['tabs'] = [
{ id: 'nodes', name: 'All core nodes' },
{
id: 'user',
name: 'My stakes',
disabled: !stakeNodes?.length,
label: warningFlag
? {
label: <NotificationBadge>{warningFlag}</NotificationBadge>,
position: 'top',
}
: undefined,
},
{ id: 'nodes', name: 'All core nodes' },
]

return tabs
}, [stakeNodes, warningFlag])
}, [warningFlag])

// -----------------------------

Expand Down Expand Up @@ -173,6 +173,7 @@ export function useStakingPage(
accountBalance,
nodes,
filteredNodes,
stakeNodes,
filteredStakeNodes,
selectedTab,
tabs,
Expand Down

0 comments on commit c6cdd8f

Please sign in to comment.