Skip to content
This repository was archived by the owner on Nov 10, 2023. It is now read-only.

fix: asset types #3655

Merged
iamacook merged 2 commits into from
Mar 14, 2022
Merged

fix: asset types #3655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e0c880
fix: asset types
Mar 11, 2022
a4db28f
fix: add mock
Mar 13, 2022
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
6 changes: 3 additions & 3 deletions src/logic/collectibles/sources/Gnosis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { SafeCollectibleResponse, TransactionTokenType } from '@gnosis.pm/safe-react-gateway-sdk'
import { SafeCollectibleResponse, TokenType } from '@gnosis.pm/safe-react-gateway-sdk'

import { Collectibles, NFTAsset, NFTAssets, NFTTokens } from 'src/logic/collectibles/sources/collectibles.d'
import { sameAddress } from 'src/logic/wallets/ethAddresses'
Expand All @@ -12,7 +12,7 @@ type TokenResult = {
logoUri: string
name: string
symbol: string
type: TransactionTokenType
type: TokenType
Copy link
Contributor Author

@iamacook iamacook Mar 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are checking that this is an asset.

}

type FetchResult = {
Expand All @@ -27,7 +27,7 @@ class Gnosis {
logoUri,
name: tokenName,
symbol: tokenSymbol,
type: TransactionTokenType.ERC721,
type: TokenType.ERC721,
}))

return assets
Expand Down
4 changes: 2 additions & 2 deletions src/routes/safe/components/Transactions/TxList/TokenTransferAmount.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Text } from '@gnosis.pm/safe-react-components'
import { TransactionTokenType } from '@gnosis.pm/safe-react-gateway-sdk'
import { TokenType } from '@gnosis.pm/safe-react-gateway-sdk'
import { ReactElement } from 'react'
import styled from 'styled-components'

Expand Down Expand Up @@ -34,7 +34,7 @@ export const TokenTransferAmount = ({ assetInfo }: TokenTransferAmountProps): Re
height={26}
onError={(error) => {
error.currentTarget.onerror = null
error.currentTarget.src = assetInfo.tokenType === TransactionTokenType.ERC721 ? NFTIcon : TokenPlaceholder
error.currentTarget.src = assetInfo.tokenType === TokenType.ERC721 ? NFTIcon : TokenPlaceholder
Copy link
Contributor Author

@iamacook iamacook Mar 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comes from an asset.

}}
src={assetInfo.logoUri}
/>
Expand Down
1 change: 1 addition & 0 deletions src/setupTests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ jest.mock('@gnosis.pm/safe-react-gateway-sdk', () => {
// We require some of the enums/types from the original module
...originalModule,
Operation: jest.fn(),
TokenType: jest.fn(),
TransactionTokenType: jest.fn(),
TransactionStatus: jest.fn(),
TransferDirection: jest.fn(),
Expand Down