Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#499 | ERC1155 inventory updates #599

Merged
merged 60 commits into from
Nov 9, 2023
Merged
Changes from 1 commit
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
f62cdaf
WIP add badge UI element
ezra-sg Jul 26, 2023
859c14c
WIP fetch 1155 - todo make interface for 1155 response
ezra-sg Jul 26, 2023
f4b1ea0
Merge branch 'develop' of github.com:telosnetwork/telos-wallet into 4…
ezra-sg Aug 2, 2023
f6cb105
update nft list sorting, update badge display logic
ezra-sg Aug 2, 2023
dcc8f64
add nft quantity to table view
ezra-sg Aug 3, 2023
36f3a0f
update sorting based on updated field
ezra-sg Aug 9, 2023
0c3871a
Merge branch '326-display-nft-xfers' into 499-erc1155-inventory-updates
ezra-sg Sep 11, 2023
88a51ea
styling, cleanup, UI work - WIP null owneraddress
ezra-sg Sep 11, 2023
7dc022f
fix incorrect NFT displayed if ID is the same
ezra-sg Sep 12, 2023
e816d90
fix aspect ratio for icon viewer
ezra-sg Sep 12, 2023
3787ffe
WIP token class refactor
ezra-sg Sep 13, 2023
783dd24
Merge branch '326-display-nft-xfers' into 499-erc1155-inventory-updates
ezra-sg Sep 13, 2023
c8868e8
Merge branch '326-display-nft-xfers' into 499-erc1155-inventory-updates
ezra-sg Sep 14, 2023
aac06a2
WIP refactoring NFTs
ezra-sg Sep 14, 2023
12bebc3
fix bugs, cleanup
ezra-sg Sep 15, 2023
d03eee9
temporary - spoof user address
ezra-sg Sep 15, 2023
9f9a25d
Revert "temporary - spoof user address"
ezra-sg Sep 15, 2023
bc4703b
fixes, cleanup
ezra-sg Sep 15, 2023
c1b5aa4
update border colors
ezra-sg Sep 15, 2023
e63b6cb
small fixes, TODO owners inconsisten when coming from inventory page
ezra-sg Sep 15, 2023
290d33c
fix caching
ezra-sg Sep 15, 2023
5a95de5
inventory by contract lowercase
ezra-sg Sep 18, 2023
9d39d28
remove duplicate logic
ezra-sg Sep 18, 2023
02cf785
Merge branch '326-display-nft-xfers' into 499-erc1155-inventory-updates
ezra-sg Sep 19, 2023
0353a51
Merge branch 'develop' of github.com:telosnetwork/telos-wallet into 4…
ezra-sg Sep 20, 2023
6f69246
fix typo
ezra-sg Sep 20, 2023
c281f69
fix typo 2
ezra-sg Sep 20, 2023
6964689
Merge branch 'develop' of github.com:telosnetwork/telos-wallet into 4…
ezra-sg Oct 2, 2023
93dc9cf
fix gradient variable
ezra-sg Oct 2, 2023
6f9b74b
mock user - revert this
ezra-sg Oct 2, 2023
5eec222
fix video and audio src
ezra-sg Oct 2, 2023
170a02e
fix video and audio NFTs
ezra-sg Oct 3, 2023
5a5cd4b
WIP support 1155 and 721 properly
ezra-sg Oct 25, 2023
552bfbf
WIP
ezra-sg Oct 27, 2023
50067d4
type updates
ezra-sg Oct 27, 2023
c93304e
Merge branch 'develop' of github.com:telosnetwork/telos-wallet into 4…
ezra-sg Oct 27, 2023
ebbc951
fix after merge develop
ezra-sg Oct 27, 2023
0a7f90c
WIP address performance issues
ezra-sg Oct 27, 2023
5336ca3
update to use cached NFTs when constructing and fetch owners data onl…
ezra-sg Oct 31, 2023
d0ca7f3
update import
ezra-sg Oct 31, 2023
a2deef0
update details page
ezra-sg Oct 31, 2023
34ffcd5
cleanup
ezra-sg Oct 31, 2023
3077c0b
fix erc721 issue; WIP slow performance
ezra-sg Oct 31, 2023
860cf65
performance fix - use owner from original response for 721
ezra-sg Nov 1, 2023
cfd182c
TODOs - error cases
ezra-sg Nov 1, 2023
c397298
fix import
ezra-sg Nov 1, 2023
5576dd8
Merge branch 'develop' of github.com:telosnetwork/telos-wallet into 4…
ezra-sg Nov 1, 2023
9041fda
revert hardcoded address
ezra-sg Nov 2, 2023
d15586f
remove transfer tab and owners tab for 1155
ezra-sg Nov 2, 2023
2044dbc
fix snaps and one test
ezra-sg Nov 2, 2023
6d05650
comment unrelated failing tests, see issue 660
ezra-sg Nov 3, 2023
6b6b60d
disable xfer tab for 1155
ezra-sg Nov 3, 2023
c1cf6a3
remove old snaps
ezra-sg Nov 3, 2023
33e9003
fix owner update logic
ezra-sg Nov 3, 2023
be87c5a
fix accoutn switch behavior on inventory page
ezra-sg Nov 3, 2023
38720f0
re-enable periodic owner update
ezra-sg Nov 3, 2023
1652450
fix nft caching
ezra-sg Nov 3, 2023
9a82a09
cleanup
ezra-sg Nov 3, 2023
d948d3b
update coverage
ezra-sg Nov 3, 2023
88debf3
fix telos arcade NFT case, fix no nft source case
ezra-sg Nov 6, 2023
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
Prev Previous commit
Next Next commit
fix video and audio src
  • Loading branch information
ezra-sg committed Oct 2, 2023
commit 5eec222fb4be320a26e2de6effdde7d42cdb093b
8 changes: 8 additions & 0 deletions src/antelope/types/NFTClass.ts
Original file line number Diff line number Diff line change
@@ -199,6 +199,14 @@ export class NFT {
this.preview = preview;
this.mediaType = type;
this.source = source;

if (precursorData?.tokenUri?.match(/\.(mp4|webm|ogg)$/)) {
this.videoSrc = precursorData.tokenUri;
}

if (precursorData?.tokenUri?.match(/\.(mp3|wav|aac|webm)$/)) {
this.audioSrc = precursorData.tokenUri;
}
}

// getters