Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2247,7 +2247,7 @@ function getTokensPath(chainId: Hex) {
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
return `/tokens/${convertHexToDecimal(
chainId,
)}?occurrenceFloor=3&includeNativeAssets=false&includeDuplicateSymbolAssets=false&includeTokenFees=false&includeAssetType=false`;
)}?occurrenceFloor=3&includeNativeAssets=false&includeTokenFees=false&includeAssetType=false`;
}

type WithControllerCallback<ReturnValue> = ({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1363,5 +1363,5 @@ function getTokensPath(chainId: Hex) {
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
return `/tokens/${convertHexToDecimal(
chainId,
)}?occurrenceFloor=3&includeNativeAssets=false&includeDuplicateSymbolAssets=false&includeTokenFees=false&includeAssetType=false&includeERC20Permit=false&includeStorage=false`;
)}?occurrenceFloor=3&includeNativeAssets=false&includeTokenFees=false&includeAssetType=false&includeERC20Permit=false&includeStorage=false`;
}
12 changes: 6 additions & 6 deletions packages/assets-controllers/src/token-service.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ describe('Token service', () => {
const { signal } = new AbortController();
nock(TOKEN_END_POINT_API)
.get(
`/tokens/${sampleDecimalChainId}?occurrenceFloor=3&includeNativeAssets=false&includeDuplicateSymbolAssets=false&includeTokenFees=false&includeAssetType=false&includeERC20Permit=false&includeStorage=false`,
`/tokens/${sampleDecimalChainId}?occurrenceFloor=3&includeNativeAssets=false&includeTokenFees=false&includeAssetType=false&includeERC20Permit=false&includeStorage=false`,
)
.reply(200, sampleTokenList)
.persist();
Expand All @@ -260,7 +260,7 @@ describe('Token service', () => {

nock(TOKEN_END_POINT_API)
.get(
`/tokens/${lineaChainId}?occurrenceFloor=1&includeNativeAssets=false&includeDuplicateSymbolAssets=false&includeTokenFees=false&includeAssetType=false&includeERC20Permit=false&includeStorage=false`,
`/tokens/${lineaChainId}?occurrenceFloor=1&includeNativeAssets=false&includeTokenFees=false&includeAssetType=false&includeERC20Permit=false&includeStorage=false`,
)
.reply(200, sampleTokenListLinea)
.persist();
Expand All @@ -274,7 +274,7 @@ describe('Token service', () => {
const abortController = new AbortController();
nock(TOKEN_END_POINT_API)
.get(
`/tokens/${sampleDecimalChainId}?occurrenceFloor=3&includeNativeAssets=false&includeDuplicateSymbolAssets=false&includeTokenFees=false&includeAssetType=false&includeERC20Permit=false&includeStorage=false`,
`/tokens/${sampleDecimalChainId}?occurrenceFloor=3&includeNativeAssets=false&includeTokenFees=false&includeAssetType=false&includeERC20Permit=false&includeStorage=false`,
)
// well beyond time it will take to abort
.delay(ONE_SECOND_IN_MILLISECONDS)
Expand All @@ -294,7 +294,7 @@ describe('Token service', () => {
const { signal } = new AbortController();
nock(TOKEN_END_POINT_API)
.get(
`/tokens/${sampleDecimalChainId}?occurrenceFloor=3&includeNativeAssets=false&includeDuplicateSymbolAssets=false&includeTokenFees=false&includeAssetType=false&includeERC20Permit=false&includeStorage=false`,
`/tokens/${sampleDecimalChainId}?occurrenceFloor=3&includeNativeAssets=false&includeTokenFees=false&includeAssetType=false&includeERC20Permit=false&includeStorage=false`,
)
.replyWithError('Example network error')
.persist();
Expand All @@ -308,7 +308,7 @@ describe('Token service', () => {
const { signal } = new AbortController();
nock(TOKEN_END_POINT_API)
.get(
`/tokens/${sampleDecimalChainId}?occurrenceFloor=3&includeNativeAssets=false&includeDuplicateSymbolAssets=false&includeTokenFees=false&includeAssetType=false&includeERC20Permit=false&includeStorage=false`,
`/tokens/${sampleDecimalChainId}?occurrenceFloor=3&includeNativeAssets=false&includeTokenFees=false&includeAssetType=false&includeERC20Permit=false&includeStorage=false`,
)
.reply(500)
.persist();
Expand All @@ -322,7 +322,7 @@ describe('Token service', () => {
const { signal } = new AbortController();
nock(TOKEN_END_POINT_API)
.get(
`/tokens/${sampleDecimalChainId}?occurrenceFloor=3&includeNativeAssets=false&includeDuplicateSymbolAssets=false&includeTokenFees=false&includeAssetType=false&includeERC20Permit=false&includeStorage=false`,
`/tokens/${sampleDecimalChainId}?occurrenceFloor=3&includeNativeAssets=false&includeTokenFees=false&includeAssetType=false&includeERC20Permit=false&includeStorage=false`,
)
// well beyond timeout
.delay(ONE_SECOND_IN_MILLISECONDS)
Expand Down
2 changes: 1 addition & 1 deletion packages/assets-controllers/src/token-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function getTokensURL(chainId: Hex) {
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
return `${TOKEN_END_POINT_API}/tokens/${convertHexToDecimal(
chainId,
)}?occurrenceFloor=${occurrenceFloor}&includeNativeAssets=false&includeDuplicateSymbolAssets=false&includeTokenFees=false&includeAssetType=false&includeERC20Permit=false&includeStorage=false`;
)}?occurrenceFloor=${occurrenceFloor}&includeNativeAssets=false&includeTokenFees=false&includeAssetType=false&includeERC20Permit=false&includeStorage=false`;
}

/**
Expand Down
Loading