Skip to content

Commit 1b00468

Browse files
authored
Merge pull request #41 from codingknite/burnt-fees-icons-fix
Burnt fees icons fix
2 parents 9efa1d0 + 69f254a commit 1b00468

File tree

4 files changed

+11
-22
lines changed

4 files changed

+11
-22
lines changed

.husky/pre-commit

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ echo 🧿 Running file linter...
66
npx lint-staged
77

88
# format svg
9-
echo 🧿 Running svg formatter...
10-
for file in `git diff --diff-filter=ACMRT --cached --name-only | grep ".svg\$"`
11-
do
12-
echo "Formatting $file"
13-
./node_modules/.bin/svgo -q $file
14-
git add $file
15-
done
9+
# todo: disable for now. investigate why it's failing then re-enable
10+
# echo 🧿 Running svg formatter...
11+
# for file in `git diff --diff-filter=ACMRT --cached --name-only | grep ".svg\$"`
12+
# do
13+
# echo "Formatting $file"
14+
# ./node_modules/.bin/svgo -q $file
15+
# git add $file
16+
# done
1617

1718
echo ✅ All pre-commit jobs are done

ui/block/BlockDetails.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,7 @@ const BlockDetails = ({ query }: Props) => {
963963
</DetailsInfoItem.Label>
964964
<DetailsInfoItem.Value>
965965
<Skeleton isLoaded={ !isPlaceholderData } display="inline-block">
966-
<TbCoins size={ 20 } color="gray.500"/>
966+
<TbCoins size={ 20 } color="#718096"/>
967967
</Skeleton>
968968
<Skeleton isLoaded={ !isPlaceholderData } ml={ 2 }>
969969
{ burntFees.dividedBy(WEI).toFixed() } { currencyUnits.ether }

ui/snippets/header/Burger.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ const Burger = ({ isMarketplaceAppPage }: Props) => {
4747
<DrawerOverlay/>
4848
<DrawerContent maxWidth="330px">
4949
<DrawerBody p={ 6 } display="flex" flexDirection="column">
50-
{ config.chain.isTestnet && <IconSvg name="testnet" h="14px" w="37px" color="red.400" alignSelf="flex-start"/> }
50+
{ config.chain.isTestnet && <IconSvg name="testnetv2" h="14px" w="37px" color="red.400" alignSelf="flex-start"/> }
5151
<Flex alignItems="center" justifyContent="space-between">
5252
<NetworkLogo onClick={ handleNetworkLogoClick }/>
5353
{ config.UI.sidebar.featuredNetworks ? (

ui/tx/details/TxDetailsBurntFees.tsx

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,19 @@ import { TbCoins } from 'react-icons/tb';
55

66
import type { Transaction } from 'types/api/transaction';
77

8-
import config from 'configs/app';
9-
import { ZERO } from 'lib/consts';
108
import { currencyUnits } from 'lib/units';
119
import CurrencyValue from 'ui/shared/CurrencyValue';
1210
import * as DetailsInfoItem from 'ui/shared/DetailsInfoItem';
1311

14-
const rollupFeature = config.features.rollup;
15-
1612
interface Props {
1713
data: Transaction;
1814
isLoading?: boolean;
1915
}
2016

2117
const TxDetailsBurntFees = ({ data, isLoading }: Props) => {
2218

23-
if (config.UI.views.tx.hiddenFields?.burnt_fees || (rollupFeature.isEnabled && rollupFeature.type === 'optimistic')) {
24-
return null;
25-
}
26-
2719
const value = BigNumber(data.tx_burnt_fee || 0).plus(BigNumber(data.blob_gas_used || 0).multipliedBy(BigNumber(data.blob_gas_price || 0)));
2820

29-
if (value.isEqualTo(ZERO)) {
30-
return null;
31-
}
32-
3321
return (
3422
<>
3523
<DetailsInfoItem.Label
@@ -43,7 +31,7 @@ const TxDetailsBurntFees = ({ data, isLoading }: Props) => {
4331
</DetailsInfoItem.Label>
4432
<DetailsInfoItem.Value>
4533
<Skeleton isLoaded={ !isLoading } display="inline-block">
46-
<TbCoins size={ 20 } color="gray.500"/>
34+
<TbCoins size={ 20 } color="#718096"/>
4735
</Skeleton>
4836
<CurrencyValue
4937
value={ value.toString() }

0 commit comments

Comments
 (0)