From 01d4e19c386937fb8497f208fdcaa943b40a1206 Mon Sep 17 00:00:00 2001 From: mstfash Date: Sat, 18 Mar 2023 02:03:04 +0200 Subject: [PATCH] fix image require --- .../AuctionsOperations/AuctionsPayment.tsx | 14 +++++++++----- src/components/Brand.tsx | 2 +- src/components/WalletModal/PendingView.tsx | 5 ++++- src/containers/Earn/Staking/Statistics.tsx | 8 +++++--- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/src/components/AuctionsOperations/AuctionsPayment.tsx b/src/components/AuctionsOperations/AuctionsPayment.tsx index f03257ed..36857dd4 100644 --- a/src/components/AuctionsOperations/AuctionsPayment.tsx +++ b/src/components/AuctionsOperations/AuctionsPayment.tsx @@ -296,11 +296,15 @@ const AuctionsPayment = () => { } const returnClaimValues = () => { - if (Number(protInternalBalance) > 0) { - return { amount: protInternalBalance, symbol: 'FLX' } - } - - return { amount: internalBalance, symbol: 'RAI' } + const amount = + Number(protInternalBalance) > Number(internalBalance) + ? Number(protInternalBalance) + : Number(internalBalance) + const symbol = + Number(protInternalBalance) > Number(internalBalance) + ? 'FLX' + : 'RAI' + return { amount, symbol } } const handleCancel = () => { diff --git a/src/components/Brand.tsx b/src/components/Brand.tsx index 915e162e..81c5c668 100644 --- a/src/components/Brand.tsx +++ b/src/components/Brand.tsx @@ -6,7 +6,7 @@ interface Props { } const Brand = ({ height }: Props) => { - const imgUrl = require(`../assets/brand-white.png`) + const imgUrl = require(`../assets/brand-white.png`).default return ( diff --git a/src/components/WalletModal/PendingView.tsx b/src/components/WalletModal/PendingView.tsx index 79987439..8beb548a 100644 --- a/src/components/WalletModal/PendingView.tsx +++ b/src/components/WalletModal/PendingView.tsx @@ -78,7 +78,10 @@ export default function PendingView({ color={option.color} header={option.name} subheader={option.description} - icon={require(`../../assets/connectors/${option.iconName}`)} + icon={ + require(`../../assets/connectors/${option.iconName}`) + .default + } /> ) } diff --git a/src/containers/Earn/Staking/Statistics.tsx b/src/containers/Earn/Staking/Statistics.tsx index ff3a695e..a85b5bdc 100644 --- a/src/containers/Earn/Staking/Statistics.tsx +++ b/src/containers/Earn/Staking/Statistics.tsx @@ -9,9 +9,11 @@ import { formatNumber } from '../../../utils/helper' const returnImg = (type = 'flx', width = '20px', height = '20px') => { return (