Skip to content

Commit

Permalink
Merge pull request #139 from secretkeylabs/release/v0.32.1
Browse files Browse the repository at this point in the history
release: v0.32.1 to main
  • Loading branch information
teebszet committed Mar 18, 2024
2 parents 166ada9 + ea9a07f commit da0c803
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 9 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "xverse-web-extension",
"description": "A Bitcoin wallet for Web3",
"version": "0.32.0",
"version": "0.32.1",
"private": true,
"engines": {
"node": "^18.18.2"
Expand Down
7 changes: 5 additions & 2 deletions src/app/hooks/queries/ordinals/useGetBrc20FungibleTokens.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
getOrdinalsFtBalance,
} from '@secretkeylabs/xverse-core';
import { useQuery } from '@tanstack/react-query';
import BigNumber from 'bignumber.js';

export const brc20TokenToFungibleToken = (coin: Brc20Token): FungibleToken => ({
name: coin.name,
Expand Down Expand Up @@ -43,7 +44,6 @@ export const fetchBrc20FungibleTokens =
...ft,
tokenFiatRate: Number(found.tokenFiatRate),
name: found.name,
supported: found.supported,
};
})
.concat(
Expand Down Expand Up @@ -71,6 +71,9 @@ export const useVisibleBrc20FungibleTokens = (): ReturnType<typeof useGetBrc20Fu
const brc20Query = useGetBrc20FungibleTokens();
return {
...brc20Query,
visible: (brc20Query.data ?? []).filter((ft) => brc20ManageTokens[ft.principal] !== false),
visible: (brc20Query.data ?? []).filter((ft) => {
const userSetting = brc20ManageTokens[ft.principal];
return userSetting === true || (userSetting === undefined && new BigNumber(ft.balance).gt(0));
}),
};
};
6 changes: 5 additions & 1 deletion src/app/hooks/queries/runes/useGetRuneFungibleTokens.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import useRunesApi from '@hooks/useRunesApi';
import useWalletSelector from '@hooks/useWalletSelector';
import { FungibleToken } from '@secretkeylabs/xverse-core';
import { useQuery } from '@tanstack/react-query';
import BigNumber from 'bignumber.js';

export const useGetRuneFungibleTokens = () => {
const { ordinalsAddress, network } = useWalletSelector();
Expand All @@ -26,6 +27,9 @@ export const useVisibleRuneFungibleTokens = (): ReturnType<typeof useGetRuneFung
const runesQuery = useGetRuneFungibleTokens();
return {
...runesQuery,
visible: (runesQuery.data ?? []).filter((rune) => runesManageTokens[rune.principal] !== false),
visible: (runesQuery.data ?? []).filter((ft) => {
const userSetting = runesManageTokens[ft.principal];
return userSetting === true || (userSetting === undefined && new BigNumber(ft.balance).gt(0));
}),
};
};
8 changes: 5 additions & 3 deletions src/app/hooks/queries/stx/useGetSip10FungibleTokens.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
getFtData,
} from '@secretkeylabs/xverse-core';
import { useQuery } from '@tanstack/react-query';
import BigNumber from 'bignumber.js';

export const fetchSip10FungibleTokens =
(
Expand All @@ -35,7 +36,6 @@ export const fetchSip10FungibleTokens =
return {
...ft,
...found,
visible: true,
name: found.name || ft.principal.split('.')[1],
};
})
Expand All @@ -48,7 +48,6 @@ export const fetchSip10FungibleTokens =
assetName: coin.name || coin.contract.split('.')[1],
protocol: 'stacks',
balance: '0',
visible: true,
total_sent: '',
total_received: '',
})),
Expand Down Expand Up @@ -80,6 +79,9 @@ export const useVisibleSip10FungibleTokens = (): ReturnType<typeof useGetSip10Fu
const sip10Query = useGetSip10FungibleTokens();
return {
...sip10Query,
visible: (sip10Query.data ?? []).filter((ft) => sip10ManageTokens[ft.principal] !== false),
visible: (sip10Query.data ?? []).filter((ft) => {
const userSetting = sip10ManageTokens[ft.principal];
return userSetting === true || (userSetting === undefined && new BigNumber(ft.balance).gt(0));
}),
};
};

0 comments on commit da0c803

Please sign in to comment.