Skip to content

Commit

Permalink
Fix warning and errors (#2296)
Browse files Browse the repository at this point in the history
  • Loading branch information
onnovisser authored Jul 22, 2024
1 parent 1cac515 commit 8b8769c
Show file tree
Hide file tree
Showing 114 changed files with 366 additions and 987 deletions.
2 changes: 1 addition & 1 deletion centrifuge-app/src/components/AssetSummary.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ type Props = {
loan?: Loan | TinlakeLoan
}

export const AssetSummary: React.FC<Props> = ({ data, children, loan }) => {
export function AssetSummary({ data, children, loan }: Props) {
const theme = useTheme()
return (
<Stack bg={theme.colors.backgroundSecondary} pl={3}>
Expand Down
107 changes: 0 additions & 107 deletions centrifuge-app/src/components/BuyDialog.tsx

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ function AssetPerformanceChart({ pool, poolId, loanId }: Props) {
}

return getCSVDownloadUrl(assetSnapshots as any)
}, [assetSnapshots, pool.currency.symbol])
}, [assetSnapshots])

const data: ChartData[] = React.useMemo(() => {
if (!asset || !assetSnapshots) return []
Expand All @@ -79,7 +79,7 @@ function AssetPerformanceChart({ pool, poolId, loanId }: Props) {
const today = new Date()
today.setDate(today.getDate() + 1)
const maturity = new Date(asset.pricing.maturityDate ?? '')
if (today.getTime() >= maturity.getTime() || assetSnapshots.length == 0) return historic
if (today.getTime() >= maturity.getTime() || assetSnapshots.length === 0) return historic

const days = Math.floor((maturity.getTime() - today.getTime()) / (24 * 60 * 60 * 1000)) + 2

Expand Down Expand Up @@ -116,7 +116,7 @@ function AssetPerformanceChart({ pool, poolId, loanId }: Props) {
}
}),
]
}, [asset, assetSnapshots, activeFilter])
}, [asset, assetSnapshots])

const priceRange = React.useMemo(() => {
if (!data) return [0, 100]
Expand Down
12 changes: 2 additions & 10 deletions centrifuge-app/src/components/Charts/PoolPerformanceChart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -237,20 +237,12 @@ function CustomLegend({
borderLeftColor={theme.colors.accentPrimary}
gap="4px"
>
<Tooltips type={'nav'}>
<Text variant="body3" color="textSecondary">
NAV
</Text>
</Tooltips>
<Tooltips type="nav" />
<Text variant="body1">{formatBalance(data.nav, 'USD')}</Text>
</Stack>
{data.price && (
<Stack borderLeftWidth="3px" pl={1} borderLeftStyle="solid" borderLeftColor="#FFC012" gap="4px">
<Tooltips type={'singleTrancheTokenPrice'}>
<Text variant="body3" color="textSecondary">
Token price
</Text>
</Tooltips>
<Tooltips type="singleTrancheTokenPrice" />
<Text variant="body1">{data.price ? formatBalance(data.price, 'USD', 6) : '-'}</Text>
</Stack>
)}
Expand Down
5 changes: 1 addition & 4 deletions centrifuge-app/src/components/Charts/PriceYieldChart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,7 @@ function PriceYieldChart({
) : null
}

const CustomLegend: React.VFC<{
data: ChartData
poolId: string
}> = ({ data, poolId }) => {
function CustomLegend({ data, poolId }: { data: ChartData; poolId: string }) {
const theme = useTheme()
const pool = usePool(poolId)

Expand Down
2 changes: 1 addition & 1 deletion centrifuge-app/src/components/Charts/Tooltip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { formatBalance, formatPercentage } from '../../utils/formatting'

type CustomizedTooltipProps = TooltipProps<any, any> & { currency: string; precision?: number }

export const CustomizedTooltip: React.FC<CustomizedTooltipProps> = ({ payload, currency, precision }) => {
export function CustomizedTooltip({ payload, currency, precision }: CustomizedTooltipProps) {
if (payload && payload?.length > 0) {
return (
<TooltipContainer>
Expand Down
2 changes: 1 addition & 1 deletion centrifuge-app/src/components/CollectionCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ type Props = {
collection: Collection
}

export const CollectionCard: React.FC<Props> = ({ collection }) => {
export function CollectionCard({ collection }: Props) {
const [visible, setVisible] = React.useState(false)
const ref = React.useRef<HTMLAnchorElement>(null)

Expand Down
2 changes: 1 addition & 1 deletion centrifuge-app/src/components/ContextActions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ type Props = {
}
}

export const ContextActions: React.FC<Props> = ({ actions, parent }) => {
export function ContextActions({ actions, parent }: Props) {
return (
<ButtonGroup variant="small">
{actions && (
Expand Down
26 changes: 12 additions & 14 deletions centrifuge-app/src/components/DebugFlags/DebugFlags.tsx
Original file line number Diff line number Diff line change
@@ -1,23 +1,17 @@
import { Box, Shelf, Stack, Text } from '@centrifuge/fabric'
import * as React from 'react'
import styled from 'styled-components'
import { Key, flagsConfig } from './config'
import { DebugFlagsContext, FlagsState, initialFlagsState, useDebugFlags } from './context'
import { Key, genericFlagsConfig } from './config'
import { DebugFlagsContext, Flags, initialFlagsState, useDebugFlags } from './context'

function DebugFlagsImpl({
children,
onChange,
}: {
children?: React.ReactNode
onChange?: (state: FlagsState) => void
}) {
function DebugFlagsImpl({ children, onChange }: { children?: React.ReactNode; onChange?: (state: Flags) => void }) {
const [state, setState] = React.useState(initialFlagsState)
const [tracked, setTracked] = React.useState({})

const ctx = React.useMemo(
() => ({
flags: Object.entries(state).reduce((obj, [key, value]) => {
const conf = flagsConfig[key as Key]
const conf = genericFlagsConfig[key as Key]
obj[key] = 'options' in conf ? conf.options[value as string] : value
return obj
}, {} as any),
Expand Down Expand Up @@ -56,11 +50,15 @@ function DebugFlagsImpl({
)
}

const Panel: React.FC<{
state: FlagsState
function Panel({
state,
usedKeys,
onChange,
}: {
state: Flags
usedKeys: Set<any>
onChange: (key: Key, val: any) => void
}> = ({ state, usedKeys, onChange }) => {
}) {
const [open, setOpen] = React.useState(false)
const { showUnusedFlags } = useDebugFlags()

Expand All @@ -81,7 +79,7 @@ const Panel: React.FC<{
</Shelf>
{open && (
<StyledOpenPanel width={400} gap="1">
{Object.entries(flagsConfig).map(([key, obj]) => {
{Object.entries(genericFlagsConfig).map(([key, obj]) => {
const used = usedKeys.has(key) || obj.alwaysShow
const value = state[key as Key]
const visible = used || !!showUnusedFlags
Expand Down
11 changes: 4 additions & 7 deletions centrifuge-app/src/components/DebugFlags/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ export type Key =
| 'showOrderExecution'
| 'address'
| 'evmAddress'
| 'batchMintNFTs'
| 'persistDebugFlags'
| 'showUnusedFlags'
| 'allowInvestBelowMin'
Expand All @@ -51,7 +50,7 @@ export type Key =
| 'showTokenYields'
| 'showOracleTx'

export const flagsConfig: Record<Key, DebugFlagConfig> = {
export const flagsConfig = {
address: {
default: '',
type: 'text',
Expand All @@ -65,10 +64,6 @@ export const flagsConfig: Record<Key, DebugFlagConfig> = {
default: false,
type: 'checkbox',
},
batchMintNFTs: {
default: false,
type: 'checkbox',
},
convertAddress: {
Component: ConvertAddressDialogWithButton,
alwaysShow: true,
Expand Down Expand Up @@ -140,4 +135,6 @@ export const flagsConfig: Record<Key, DebugFlagConfig> = {
default: false,
type: 'checkbox',
},
}
} satisfies Record<Key, DebugFlagConfig>

export const genericFlagsConfig = flagsConfig as Record<string, DebugFlagConfig>
21 changes: 10 additions & 11 deletions centrifuge-app/src/components/DebugFlags/context.ts
Original file line number Diff line number Diff line change
@@ -1,35 +1,34 @@
import * as React from 'react'
import { debug, flagsConfig, Key } from './config'
import { debug, flagsConfig, genericFlagsConfig, Key } from './config'

export type Flags = {
[T in Key]: (typeof flagsConfig)[T] extends { options: { [key: string]: infer Y } }
? Y
[T in Key]: (typeof flagsConfig)[T] extends { options: { [key: string]: string } }
? string
: (typeof flagsConfig)[T]['default'] extends boolean
? boolean
: (typeof flagsConfig)[T]['default']
}
export type FlagsState = {
[T in Key]: (typeof flagsConfig)[T]['default']
}

interface Context {
flags: Flags
register: (id: number, keys: string[]) => void
unregister: (id: number) => void
}

export const defaultFlags: Flags = Object.entries(flagsConfig).reduce((obj, [k, v]) => {
obj[k] = 'options' in v ? v.options[v.default as string] : v.default
export const defaultFlags: Flags = Object.entries(genericFlagsConfig).reduce((obj, [k, v]) => {
obj[k] = 'options' in v ? v.options[v.default] : v.default
return obj
}, {} as any)

let persistedState: FlagsState | null = null
let persistedState: Flags | null = null
try {
const stored = localStorage.getItem('debugFlags') ?? ''
persistedState = JSON.parse(stored[0] === '{' ? stored : '') as FlagsState
persistedState = JSON.parse(stored[0] === '{' ? stored : '') as Flags
} catch (e) {
//
}
const flagKeys = Object.keys(flagsConfig)
export const initialFlagsState: FlagsState = persistedState
export const initialFlagsState: Flags = persistedState
? Object.entries(persistedState)
.filter(([k]) => flagKeys.includes(k))
.reduce((obj, [k, v]) => {
Expand Down
10 changes: 2 additions & 8 deletions centrifuge-app/src/components/DebugFlags/index.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
import * as React from 'react'
import { debug } from './config'
import { FlagsState } from './context'
import { Flags } from './context'

export * from './context'

const DebugFlagsImpl = React.lazy(() => import('./DebugFlags'))

export function DebugFlags({
children,
onChange,
}: {
children?: React.ReactNode
onChange?: (state: FlagsState) => void
}) {
export function DebugFlags({ children, onChange }: { children?: React.ReactNode; onChange?: (state: Flags) => void }) {
const fallback = <>{children}</>
return debug ? (
<React.Suspense fallback={fallback}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const CREATE_FEE_ESTIMATE = 2
const MAX_FILE_SIZE_IN_BYTES = 1024 ** 2 // 1 MB limit by default
const isImageFile = (file: File): boolean => !!file.type.match(/^image\//)

export const CreateCollectionDialog: React.FC<{ open: boolean; onClose: () => void }> = ({ open, onClose }) => {
export function CreateCollectionDialog({ open, onClose }: { open: boolean; onClose: () => void }) {
const [name, setName] = React.useState<string>('')
const [description, setDescription] = React.useState<string>('')
const [logo, setLogo] = React.useState<File | null>(null)
Expand Down
10 changes: 7 additions & 3 deletions centrifuge-app/src/components/Dialogs/ExecutiveSummaryDialog.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
import { Box, Button, Dialog, IconInfo, Stack, Text } from '@centrifuge/fabric'
import * as React from 'react'
import styled from 'styled-components'

export const ExecutiveSummaryDialog: React.FC<{
export function ExecutiveSummaryDialog({
issuerName,
href,
open,
onClose,
}: {
issuerName: string
href: string
open: boolean
onClose: () => void
}> = ({ issuerName, href, open, onClose }) => {
}) {
return (
<Dialog
isOpen={open}
Expand Down
Loading

0 comments on commit 8b8769c

Please sign in to comment.