Skip to content
Open
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
13 changes: 12 additions & 1 deletion src/model/Deal.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
export const DealState = {
Created: 0,
Accepted: 1,
Funded: 2,
Paid: 3,
Disputed: 4,
Cancelled: 5,
Resolved: 6,
Released: 7,
}

export default class Deal {
constructor(contract) {
this.contract = contract
Expand Down Expand Up @@ -32,7 +43,7 @@ export default class Deal {
this.taker = taker
this.tokenAmount = Number(tokenAmount)
this.fiatAmount = Number(fiatAmount) / 10 ** 6 // FIXME test with large input
this.state = Number(state) // FIXME constants
this.state = Number(state)
this.paymentInstructions = paymentInstructions
this.allowCancelUnacceptedAfter = new Date(Number(allowCancelUnacceptedAfter) * 1000)
this.allowCancelUnpaidAfter = new Date(Number(allowCancelUnpaidAfter) * 1000)
Expand Down
10 changes: 10 additions & 0 deletions src/pages/Me/UserDeals.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,16 @@ vi.mock('@/hooks/useContract', () => ({
// Mock models
vi.mock('@/model/Deal.js', () => {
return {
DealState: {
Created: 0,
Accepted: 1,
Funded: 2,
Paid: 3,
Disputed: 4,
Cancelled: 5,
Resolved: 6,
Released: 7,
},
default: class Deal {
// mocked constructor
constructor(c) {
Expand Down
17 changes: 13 additions & 4 deletions src/pages/Me/UserDeals.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
import { Link } from 'react-router-dom'
import { Empty, List, Skeleton, Tag } from 'antd'
import React, { useEffect, useState } from 'react'
import Deal from '@/model/Deal.js'
import Deal, { DealState } from '@/model/Deal.js'
import { useAccount } from 'wagmi'
import { useContract } from '@/hooks/useContract'
import Offer from '@/model/Offer.js'

function StateTag(args) {
const index = ['Initiated', 'Accepted', 'Funded', 'Paid', 'Disputed', 'Canceled', 'Resolved', 'Completed']
return <Tag color={args.state === 7 ? 'green' : 'blue'}>{index[args.state]}</Tag>
function StateTag({ state }: { state: number }) {
const stateNames = {
[DealState.Created]: 'Initiated',
[DealState.Accepted]: 'Accepted',
[DealState.Funded]: 'Funded',
[DealState.Paid]: 'Paid',
[DealState.Disputed]: 'Disputed',
[DealState.Cancelled]: 'Canceled',
[DealState.Resolved]: 'Resolved',
[DealState.Released]: 'Completed',
}
return <Tag color={state === DealState.Released ? 'green' : 'blue'}>{stateNames[state]}</Tag>
}

function DealItem({ deal }) {
Expand Down