Skip to content

Commit

Permalink
minor visual fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
uHappyLogic committed Dec 24, 2024
1 parent bebc348 commit f300ab6
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 28 deletions.
28 changes: 11 additions & 17 deletions src/components/withdrawUnstakedZilPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,15 @@ const WithdrawZilPanel: React.FC<WithdrawZilPanelProps> = ({
) : (
<div className="w-[4em] h-[1em] animated-gradient" />
)}

<div className='lg:w-1/3 lg:max-w-[218px]'>
<Button
className="btn-primary-gradient-aqua"
onClick={() => claim(item.address)}
loading={isClaimingInProgress}
>
Claim
</Button>
</div>

<div className='lg:w-1/3 lg:max-w-[218px]'>
<Button
className="btn-primary-gradient-aqua"
onClick={() => claim(item.address)}
loading={isClaimingInProgress}
>
Claim
</Button>
</div>
</div>
</div>
))
Expand Down Expand Up @@ -126,15 +124,11 @@ const WithdrawZilPanel: React.FC<WithdrawZilPanelProps> = ({
{stakingPoolData.data ? (
<div className='flex gap-2.5'>
<div className='body1 text-gray4'>
200.00 avZIL
</div>

<div className='regular-base text-gray4 mt-1'>
={' '}{parseFloat(
{parseFloat(
formatUnits(claim.zilAmount, 18)
).toFixed(3)}{' '}
ZIL
</div>
</div>
</div>
) : (
<div className="w-[4em] h-[1em] animated-gradient" />
Expand Down
26 changes: 16 additions & 10 deletions src/misc/formatting.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,27 @@ export function getHumanFormDuration(availableAt: DateTime) {
const units = availableAt.diff(DateTime.now()).shiftTo('days', 'hours', 'minutes').toHuman({
unitDisplay: 'long',
listStyle: 'narrow',
maximumFractionDigits: 0,
})

const mostSignificantUnit = units.split(',').reduce((acc, unit) => {
if (acc !== '') {
return acc
}
const mostSignificantUnit = units
.split(',')
.map(units => units.trim())
.reduce((acc, unit) => {
if (acc !== '') {
return acc
}

if (unit[0] !== '0') {
return unit.trim()
}
// check if unit starts with smh different that 0
// e.g., 0 days 2 hours 5 minutes should return "2 hours"
if (unit[0] !== '0') {
return unit
}

return acc
}, '')
return acc
}, '')

return `~${mostSignificantUnit}`
return `~${mostSignificantUnit || '< 1 minute'}`
}

export function convertTokenToZil(tokenAmount: bigint, zilToTokenRate: number): bigint {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/_app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export default function App({ Component, pageProps }: AppProps) {
<ConfigProvider>
<WagmiProvider config={getWagmiConfig(appConfig.chainId, appConfig.walletConnectPrivateKey)}>
<QueryClientProvider client={queryClient}>
<RainbowKitProvider>
<RainbowKitProvider showRecentTransactions={true}>
<WalletConnector.Provider>
<StakingPoolsStorage.Provider>
<StakingOperations.Provider>
Expand Down

0 comments on commit f300ab6

Please sign in to comment.