mirror of
https://github.com/Permissionless-Software-Foundation/bch-dex-taker-v2.git
synced 2026-09-21 16:52:01 -07:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
efdfb7971b | ||
|
|
8c59bdf6d8 | ||
|
|
143def9164 | ||
|
|
b58309d82a | ||
|
|
61a5ad7166 | ||
|
|
3b1b6248ab | ||
|
|
cd44f28f28 | ||
|
|
5d7994cefe | ||
|
|
ae4916e8df | ||
|
|
fe108caf33 | ||
|
|
131a41fcb4 | ||
|
|
f25ac56cdb | ||
|
|
0fb8bc586b | ||
|
|
4f8a6540e5 | ||
|
|
b29ff5fb1f | ||
|
|
9e576cbe83 | ||
|
|
e3b3b76430 | ||
|
|
f8f46fcad8 | ||
|
|
8c00d5d079 | ||
|
|
4e665cd738 | ||
|
|
af3dca0445 | ||
|
|
e1d1cee1f1 | ||
|
|
6d763be032 | ||
|
|
dc6e6d956c | ||
|
|
612f2edf70 | ||
|
|
408dc0d418 | ||
|
|
9b6e080b02 | ||
|
|
404f230cce | ||
|
|
360be9f875 |
File diff suppressed because it is too large
Load Diff
+49
-9
@@ -67,6 +67,44 @@ function App (props) {
|
||||
return false
|
||||
}, [appData, addToModal])
|
||||
|
||||
/**
|
||||
* Run background process to get bch and slp balance.
|
||||
* Also update the background state process.
|
||||
* On error this function should trigger a info modal notifying the errors.
|
||||
*/
|
||||
const backgroundAsync = useCallback(async (asyncLoad, walletTemp) => {
|
||||
try {
|
||||
appData.setModalBody(['Getting BCH balance in background!.'])
|
||||
// Get Wallet Balance
|
||||
await asyncLoad.getWalletBchBalance(walletTemp, appData.updateBchWalletState, appData)
|
||||
// Update Background state
|
||||
appData.updateBackGroundInitState({ bchInitLoaded: true })
|
||||
|
||||
// Get SLP Balance
|
||||
appData.setModalBody(['Getting SLP tokens in background!.'])
|
||||
await asyncLoad.getSlpTokenBalances(walletTemp, appData.updateBchWalletState, appData)
|
||||
|
||||
// Update Background state
|
||||
appData.updateBackGroundInitState({ slpInitLoaded: true, asyncBackgroundFinished: true })
|
||||
} catch (err) {
|
||||
console.log('App.js backgroundAsync() error!', err)
|
||||
|
||||
appData.updateBackGroundInitState({ asyncBackgroundFinished: true })
|
||||
|
||||
addToModal(`Error: ${err.message}`, appData)
|
||||
addToModal('Try selecting a different back end server using the drop-down menu at the bottom of the app.\'', appData)
|
||||
|
||||
// Update Modal State
|
||||
appData.setHideSpinner(true)
|
||||
appData.setShowStartModal(true)
|
||||
appData.setDenyClose(false)
|
||||
|
||||
// Update the startup state.
|
||||
appData.setAsyncInitFinished(true)
|
||||
appData.setAsyncInitSucceeded(false)
|
||||
}
|
||||
}, [appData, addToModal])
|
||||
|
||||
/** Load all required data before component start. */
|
||||
useEffect(() => {
|
||||
async function asyncEffect () {
|
||||
@@ -99,14 +137,6 @@ function App (props) {
|
||||
appData.setWallet(walletTemp)
|
||||
// appData.updateBchWalletState({ walletObj: walletTemp.walletInfo, appData })
|
||||
|
||||
// Get the BCH balance of the wallet.
|
||||
addToModal('Getting BCH balance', appData)
|
||||
await asyncLoad.getWalletBchBalance(walletTemp, appData.updateBchWalletState, appData)
|
||||
|
||||
// Get the SLP tokens held by the wallet.
|
||||
addToModal('Getting SLP tokens', appData)
|
||||
await asyncLoad.getSlpTokenBalances(walletTemp, appData.updateBchWalletState, appData)
|
||||
|
||||
// Get the BCH spot price
|
||||
addToModal('Getting BCH spot price in USD', appData)
|
||||
await asyncLoad.getUSDExchangeRate(walletTemp, appData.updateBchWalletState, appData)
|
||||
@@ -125,6 +155,9 @@ function App (props) {
|
||||
const nostrLib = asyncLoad.getNostrLib({ bchWallet: walletTemp })
|
||||
appData.setNostr(nostrLib)
|
||||
|
||||
const deletedChats = await asyncLoad.fetchDeletedChats()
|
||||
appData.setDeletedChats(deletedChats)
|
||||
|
||||
// Update state
|
||||
appData.setShowStartModal(false)
|
||||
appData.setDenyClose(false)
|
||||
@@ -133,6 +166,13 @@ function App (props) {
|
||||
appData.setAsyncInitFinished(true)
|
||||
appData.setAsyncInitSucceeded(true)
|
||||
console.log('App.js useEffect() startup finished successfully')
|
||||
|
||||
backgroundAsync(asyncLoad, walletTemp)
|
||||
// Get the BCH balance of the wallet.
|
||||
// addToModal('Getting BCH balance', appData)
|
||||
|
||||
// Get the SLP tokens held by the wallet.
|
||||
// addToModal('Getting SLP tokens', appData)
|
||||
} catch (err) {
|
||||
const errModalBody = [
|
||||
`Error: ${err.message}`,
|
||||
@@ -152,7 +192,7 @@ function App (props) {
|
||||
}
|
||||
}
|
||||
asyncEffect()
|
||||
}, [appData, addToModal, isSignleView])
|
||||
}, [appData, addToModal, isSignleView, backgroundAsync])
|
||||
|
||||
return (
|
||||
<>
|
||||
|
||||
@@ -3,18 +3,39 @@
|
||||
*/
|
||||
|
||||
// Global npm libraries
|
||||
import React from 'react'
|
||||
import { Container, Row, Col, Card } from 'react-bootstrap'
|
||||
import React, { useEffect, useState } from 'react'
|
||||
import { Container, Row, Col, Card, Spinner } from 'react-bootstrap'
|
||||
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
|
||||
import { faCoins } from '@fortawesome/free-solid-svg-icons'
|
||||
|
||||
const BalanceCard = (props) => {
|
||||
const { appData } = props
|
||||
const [sats, setSats] = useState('')
|
||||
const [bchBalance, setbchBalance] = useState('')
|
||||
const [usdBalance, setusdBalance] = useState('')
|
||||
|
||||
const bchjs = appData.wallet.bchjs
|
||||
const sats = appData.bchWalletState.bchBalance
|
||||
const bchBalance = bchjs.BitcoinCash.toBitcoinCash(sats)
|
||||
const usdBalance = bchjs.Util.floor2(bchBalance * appData.bchWalletState.bchUsdPrice)
|
||||
const { bchInitLoaded, asyncBackgroundFinished } = appData.asyncBackGroundInitState
|
||||
|
||||
// Calculate balances if wallet is successfully loaded!
|
||||
useEffect(() => {
|
||||
try {
|
||||
const bchjs = appData.wallet.bchjs
|
||||
if (bchjs && appData.asyncInitSucceeded) {
|
||||
const sats = appData.bchWalletState.bchBalance
|
||||
const bchBalance = bchjs.BitcoinCash.toBitcoinCash(sats)
|
||||
const usdBalance = bchjs.Util.floor2(bchBalance * appData.bchWalletState.bchUsdPrice)
|
||||
|
||||
setSats(sats)
|
||||
setbchBalance(bchBalance)
|
||||
setusdBalance(usdBalance)
|
||||
}
|
||||
} catch (error) {
|
||||
// console.warn(error)
|
||||
}
|
||||
}, [appData])
|
||||
// Background bch data loaded finished
|
||||
const backgroundDataLoaded = bchInitLoaded || asyncBackgroundFinished
|
||||
const backgroundDataError = !bchInitLoaded && asyncBackgroundFinished
|
||||
|
||||
return (
|
||||
<>
|
||||
@@ -25,25 +46,37 @@ const BalanceCard = (props) => {
|
||||
</Card.Title>
|
||||
<br />
|
||||
|
||||
<Container>
|
||||
<Row>
|
||||
<Col>
|
||||
<b>USD</b>: ${usdBalance}
|
||||
</Col>
|
||||
</Row>
|
||||
{bchInitLoaded && (
|
||||
<Container>
|
||||
<Row>
|
||||
<Col>
|
||||
<b>USD</b>: ${usdBalance}
|
||||
</Col>
|
||||
</Row>
|
||||
|
||||
<Row>
|
||||
<Col>
|
||||
<b>BCH</b>: {bchBalance}
|
||||
</Col>
|
||||
</Row>
|
||||
<Row>
|
||||
<Col>
|
||||
<b>BCH</b>: {bchBalance}
|
||||
</Col>
|
||||
</Row>
|
||||
|
||||
<Row>
|
||||
<Col>
|
||||
<b>Satoshis</b>: {sats}
|
||||
</Col>
|
||||
</Row>
|
||||
</Container>
|
||||
<Row>
|
||||
<Col>
|
||||
<b>Satoshis</b>: {sats}
|
||||
</Col>
|
||||
</Row>
|
||||
</Container>)}
|
||||
{backgroundDataError && (
|
||||
<Container>
|
||||
<span style={{ color: 'red' }}>Balance could not be loaded!</span>
|
||||
</Container>
|
||||
)}
|
||||
|
||||
{!backgroundDataLoaded && appData.asyncInitSucceeded && (
|
||||
<div className='balance-spinner-container'>
|
||||
<Spinner animation='border' />
|
||||
</div>
|
||||
)}
|
||||
</Card.Body>
|
||||
</Card>
|
||||
</>
|
||||
|
||||
@@ -50,6 +50,9 @@ export default function RefreshBchBalance (props) {
|
||||
// Get the latest balance of the wallet.
|
||||
const newBalance = await wallet.getBalance({ bchAddress: cashAddr })
|
||||
|
||||
// if bchInitLoaded is 'false', them set as true , to show the new balance.
|
||||
appData.updateBackGroundInitState({ bchInitLoaded: true })
|
||||
|
||||
addToModal('Updating BCH per USD price...')
|
||||
const bchUsdPrice = await wallet.getUsd()
|
||||
|
||||
|
||||
@@ -16,6 +16,10 @@ import RefreshBchBalance from './refresh-balance'
|
||||
function RefreshBchBalanceButton (props) {
|
||||
// Dependency injections of props
|
||||
const appData = props.appData
|
||||
const { bchInitLoaded, asyncBackgroundFinished } = appData.asyncBackGroundInitState
|
||||
|
||||
// Background bch data loaded finished
|
||||
const backgroundDataLoaded = bchInitLoaded || asyncBackgroundFinished
|
||||
|
||||
// Child function references
|
||||
const refreshBchBalanceRef = useRef()
|
||||
@@ -28,7 +32,7 @@ function RefreshBchBalanceButton (props) {
|
||||
|
||||
return (
|
||||
<>
|
||||
<Button variant='success' onClick={() => { handleButtonRefreshBalance(appData) }}>
|
||||
<Button variant='success' onClick={() => { handleButtonRefreshBalance(appData) }} disabled={!backgroundDataLoaded}>
|
||||
<FontAwesomeIcon icon={faRedo} size='lg' /> Refresh
|
||||
</Button>
|
||||
|
||||
|
||||
@@ -15,6 +15,7 @@ import RefreshBchBalance from './refresh-balance'
|
||||
function SendCard (props) {
|
||||
// Dependency injection through props
|
||||
const appData = props.appData
|
||||
const { bchInitLoaded, asyncBackgroundFinished } = appData.asyncBackGroundInitState
|
||||
|
||||
// Modal State
|
||||
const [modalBody, setModalBody] = useState([])
|
||||
@@ -29,6 +30,9 @@ function SendCard (props) {
|
||||
const [oppositeUnits, setOppositeUnits] = useState('BCH')
|
||||
const [oppositeQty, setOppositeQty] = useState(0)
|
||||
|
||||
// Background bch data loaded finished
|
||||
const backgroundDataLoaded = bchInitLoaded || asyncBackgroundFinished
|
||||
|
||||
// Child function references
|
||||
const refreshBchBalanceRef = useRef()
|
||||
|
||||
@@ -318,7 +322,7 @@ function SendCard (props) {
|
||||
|
||||
<Row>
|
||||
<Col style={{ textAlign: 'center' }}>
|
||||
<Button onClick={(e) => handleSendBch({ sendCardData, appData })}>Send</Button>
|
||||
<Button onClick={(e) => handleSendBch({ sendCardData, appData })} disabled={!backgroundDataLoaded}>Send</Button>
|
||||
</Col>
|
||||
</Row>
|
||||
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
import React from 'react'
|
||||
import { Dropdown } from 'react-bootstrap'
|
||||
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
|
||||
import { faFilter } from '@fortawesome/free-solid-svg-icons'
|
||||
|
||||
function FilterDropdown (props) {
|
||||
const { selectedFilter, setSelectedFilter } = props
|
||||
|
||||
return (
|
||||
<Dropdown>
|
||||
<Dropdown.Toggle
|
||||
variant='outline-secondary'
|
||||
className='d-flex align-items-center justify-content-around gap-2 mt-3'
|
||||
style={{ minWidth: '150px' }}
|
||||
>
|
||||
<FontAwesomeIcon icon={faFilter} />
|
||||
<span>{selectedFilter}</span>
|
||||
</Dropdown.Toggle>
|
||||
|
||||
<Dropdown.Menu>
|
||||
<Dropdown.Item onClick={() => setSelectedFilter('Misc')}>
|
||||
Misc
|
||||
</Dropdown.Item>
|
||||
<Dropdown.Item onClick={() => setSelectedFilter('Art')}>
|
||||
Art
|
||||
</Dropdown.Item>
|
||||
<Dropdown.Item onClick={() => setSelectedFilter('Video')}>
|
||||
Video
|
||||
</Dropdown.Item>
|
||||
<Dropdown.Item onClick={() => setSelectedFilter('Writing')}>
|
||||
Writing
|
||||
</Dropdown.Item>
|
||||
<Dropdown.Item onClick={() => setSelectedFilter('Download')}>
|
||||
Download
|
||||
</Dropdown.Item>
|
||||
</Dropdown.Menu>
|
||||
</Dropdown>
|
||||
)
|
||||
}
|
||||
|
||||
export default FilterDropdown
|
||||
@@ -11,7 +11,7 @@
|
||||
*/
|
||||
|
||||
// Global npm libraries
|
||||
import React, { useState, useEffect, useCallback } from 'react'
|
||||
import React, { useState, useEffect, useCallback, useRef } from 'react'
|
||||
import { Container, Row, Col, Button, Spinner } from 'react-bootstrap'
|
||||
import axios from 'axios'
|
||||
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
|
||||
@@ -20,6 +20,7 @@ import { faRedo } from '@fortawesome/free-solid-svg-icons'
|
||||
// Local libraries
|
||||
import config from '../../../config'
|
||||
import TokenCard from './token-card'
|
||||
import FilterDropdown from './filter-dropdown'
|
||||
|
||||
// Global variables and constants
|
||||
const SERVER = config.dexServer
|
||||
@@ -33,11 +34,26 @@ function NftsForSale (props) {
|
||||
const [offersAreLoaded, setOffersAreLoaded] = useState(false)
|
||||
const [iconsAreLoaded, setIconsAreLoaded] = useState(false)
|
||||
const [dataAreLoaded, setDataAreLoaded] = useState(false)
|
||||
const [currentPage, setCurrentPage] = useState(0)
|
||||
const [lastLoadedPage, setLastLoadedPage] = useState(0)
|
||||
const [totalPages, setTotalPages] = useState(0)
|
||||
const [selectedFilter, setSelectedFilter] = useState('Misc')
|
||||
|
||||
// Handler for refresh button
|
||||
const handleRefresh = () => {
|
||||
console.log('handling refresh')
|
||||
loadNftOffers()
|
||||
// Flag to prevent load data multiple times on component mount!
|
||||
const componentMountRef = useRef(false)
|
||||
|
||||
// Handler for previous page
|
||||
const handlePreviousPage = () => {
|
||||
if (currentPage > 0) {
|
||||
setCurrentPage(currentPage - 1)
|
||||
}
|
||||
}
|
||||
|
||||
// Handler for next page
|
||||
const handleNextPage = () => {
|
||||
if (currentPage < totalPages - 1) {
|
||||
setCurrentPage(currentPage + 1)
|
||||
}
|
||||
}
|
||||
|
||||
// Function to process token data
|
||||
@@ -58,6 +74,20 @@ function NftsForSale (props) {
|
||||
return offer
|
||||
}
|
||||
}, [appData])
|
||||
// Function to process token metadata (iconUrl , userData).
|
||||
const processOfferMetadata = useCallback(async (offer) => {
|
||||
try {
|
||||
// Token icon
|
||||
if (offer.tokenIconUrl) {
|
||||
offer.icon = offer.tokenIconUrl
|
||||
offer.iconAlreadyDownloaded = true
|
||||
offer.userData = JSON.parse(offer.userDataStr)
|
||||
}
|
||||
return offer
|
||||
} catch (error) {
|
||||
return offer
|
||||
}
|
||||
}, [])
|
||||
|
||||
// Fetch offers
|
||||
const getNftOffers = useCallback(async (page = 0) => {
|
||||
@@ -65,15 +95,17 @@ function NftsForSale (props) {
|
||||
setOffersAreLoaded(false)
|
||||
|
||||
const result = await axios.get(`${SERVER}/offer/list/nft/${page}`)
|
||||
const rawOffers = result.data
|
||||
const rawOffers = result.data.data
|
||||
console.log('rawOffers: ', rawOffers)
|
||||
setTotalPages(result.data.pagination.totalPages)
|
||||
|
||||
// Process each offer
|
||||
const processedOffers = []
|
||||
for (let i = 0; i < rawOffers.length; i++) {
|
||||
const offer = rawOffers[i]
|
||||
const processedOffer = await processTokenData(offer)
|
||||
processedOffers.push(processedOffer)
|
||||
const processedOfferMetadata = await processOfferMetadata(processedOffer)
|
||||
processedOffers.push(processedOfferMetadata)
|
||||
}
|
||||
|
||||
setOffersAreLoaded(true)
|
||||
@@ -84,7 +116,7 @@ function NftsForSale (props) {
|
||||
setOffersAreLoaded(true)
|
||||
throw err
|
||||
}
|
||||
}, [processTokenData])
|
||||
}, [processTokenData, processOfferMetadata])
|
||||
|
||||
// This function loads the token data .
|
||||
const lazyLoadTokenData = useCallback(async (tokens) => {
|
||||
@@ -153,6 +185,7 @@ function NftsForSale (props) {
|
||||
const thisToken = tokens[i]
|
||||
|
||||
// Incon does not need to be downloaded, so continue with the next one
|
||||
console.log('Icon already downloaded ', thisToken.iconAlreadyDownloaded)
|
||||
if (thisToken.iconAlreadyDownloaded) continue
|
||||
|
||||
// Try to get token icon url from mutable data.
|
||||
@@ -161,7 +194,7 @@ function NftsForSale (props) {
|
||||
if (iconUrl) {
|
||||
// Set the icon url to the token , this can be used to display the icon in the token card component.
|
||||
thisToken.icon = iconUrl
|
||||
thisToken.tokenData.userData = userData
|
||||
thisToken.userData = userData
|
||||
}
|
||||
|
||||
// Mark token to prevent fetch token icon again.
|
||||
@@ -207,11 +240,11 @@ function NftsForSale (props) {
|
||||
}, [appData])
|
||||
|
||||
// Main function to load NFT offers
|
||||
const loadNftOffers = useCallback(async () => {
|
||||
const loadNftOffers = useCallback(async (page = 0) => {
|
||||
try {
|
||||
setIsLoading(true)
|
||||
// Get tokens in offers
|
||||
const offers = await getNftOffers()
|
||||
const offers = await getNftOffers(page)
|
||||
console.log('offers: ', offers)
|
||||
// Review cached data to populate token data from cached data
|
||||
await reviewNftCachedData(offers)
|
||||
@@ -233,10 +266,31 @@ function NftsForSale (props) {
|
||||
|
||||
// Effect to load NFTs on component mount
|
||||
useEffect(() => {
|
||||
console.log('loading nfts for sale')
|
||||
loadNftOffers()
|
||||
// Peevent to run multiple times
|
||||
if (!componentMountRef.current) {
|
||||
console.log('loading nfts for sale')
|
||||
loadNftOffers()
|
||||
componentMountRef.current = true
|
||||
}
|
||||
}, [loadNftOffers])
|
||||
|
||||
// Effect to reload data when page changes
|
||||
useEffect(() => {
|
||||
// Validate to prevent load same page again
|
||||
if (currentPage >= 0 && currentPage !== lastLoadedPage) {
|
||||
console.log('page changed, reloading nfts for sale')
|
||||
loadNftOffers(currentPage)
|
||||
setLastLoadedPage(currentPage)
|
||||
}
|
||||
}, [currentPage, loadNftOffers, lastLoadedPage])
|
||||
|
||||
// Handler for refresh button
|
||||
const handleRefresh = useCallback(() => {
|
||||
console.log('handling refresh')
|
||||
|
||||
loadNftOffers(currentPage)
|
||||
}, [currentPage, loadNftOffers])
|
||||
|
||||
// Get Cid from url
|
||||
const parseCid = (url) => {
|
||||
// get the cid from the url format 'ipfs://bafybeicem27xbzs65uvbcgykcmscsgln3lmhbfrcoec3gdttkdgtxv5acq
|
||||
@@ -247,8 +301,34 @@ function NftsForSale (props) {
|
||||
return url
|
||||
}
|
||||
|
||||
const updateOffer = useCallback(async (offer) => {
|
||||
try {
|
||||
if (!offer) return
|
||||
setOffersAreLoaded(false)
|
||||
const processedOffer = await processTokenData(offer)
|
||||
const processedOfferMetadata = await processOfferMetadata(processedOffer)
|
||||
|
||||
setOffers(offers => {
|
||||
// find offer
|
||||
const index = offers.findIndex((val) => { return val.tokenId === offer.tokenId })
|
||||
// Save existing token data
|
||||
processedOfferMetadata.tokenData = offers[index].tokenData
|
||||
// replace with the new data
|
||||
offers[index] = processedOfferMetadata
|
||||
return offers
|
||||
})
|
||||
|
||||
// Re-render tokens cards , to load the new data.
|
||||
setTimeout(() => {
|
||||
setOffersAreLoaded(true)
|
||||
}, 500)
|
||||
} catch (error) {
|
||||
console.warn(error)
|
||||
}
|
||||
}, [processOfferMetadata, processTokenData])
|
||||
|
||||
// This function generates a Token Card for each token in the wallet.
|
||||
function generateCards (offers) {
|
||||
const generateCards = useCallback(() => {
|
||||
console.log('generateCards() offerData: ', offers)
|
||||
|
||||
const tokens = offers
|
||||
@@ -264,13 +344,14 @@ function NftsForSale (props) {
|
||||
token={thisToken}
|
||||
handleRefresh={handleRefresh}
|
||||
key={`${thisToken.tokenId + i}`}
|
||||
updateOffer={updateOffer}
|
||||
/>
|
||||
)
|
||||
tokenCards.push(thisTokenCard)
|
||||
}
|
||||
|
||||
return tokenCards
|
||||
}
|
||||
}, [offers, appData, handleRefresh, updateOffer])
|
||||
|
||||
return (
|
||||
<Container>
|
||||
@@ -278,6 +359,9 @@ function NftsForSale (props) {
|
||||
<Col>
|
||||
<h1>NFTs for Sale</h1>
|
||||
</Col>
|
||||
<Col className='d-flex justify-content-end'>
|
||||
<FilterDropdown selectedFilter={selectedFilter} setSelectedFilter={setSelectedFilter} />
|
||||
</Col>
|
||||
</Row>
|
||||
<Row>
|
||||
<Col xs={12} style={{ display: 'flex', justifyContent: 'center', alignItems: 'center' }}>
|
||||
@@ -311,6 +395,121 @@ function NftsForSale (props) {
|
||||
</Row>
|
||||
)}
|
||||
|
||||
{/* Pagination Controls */}
|
||||
{offersAreLoaded && totalPages > 1 && (
|
||||
<div
|
||||
style={{
|
||||
position: 'fixed',
|
||||
bottom: '70px',
|
||||
left: '50%',
|
||||
transform: 'translateX(-50%)',
|
||||
zIndex: 1000,
|
||||
background: 'rgba(255, 255, 255, 0.95)',
|
||||
backdropFilter: 'blur(10px)',
|
||||
borderRadius: '25px',
|
||||
padding: '12px 20px',
|
||||
boxShadow: '0 8px 32px rgba(0, 0, 0, 0.1)',
|
||||
border: '1px solid rgba(255, 255, 255, 0.2)',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
gap: '16px',
|
||||
minWidth: '280px',
|
||||
justifyContent: 'center'
|
||||
}}
|
||||
>
|
||||
<Button
|
||||
variant='outline-primary'
|
||||
size='sm'
|
||||
onClick={handlePreviousPage}
|
||||
disabled={currentPage === 0}
|
||||
style={{
|
||||
borderRadius: '20px',
|
||||
padding: '8px 16px',
|
||||
border: '2px solid #007bff',
|
||||
background: currentPage === 0 ? 'transparent' : '#007bff',
|
||||
color: currentPage === 0 ? '#6c757d' : 'white',
|
||||
fontWeight: '500',
|
||||
fontSize: '14px',
|
||||
transition: 'all 0.3s ease',
|
||||
minWidth: '80px',
|
||||
opacity: currentPage === 0 ? 0.5 : 1,
|
||||
cursor: currentPage === 0 ? 'not-allowed' : 'pointer'
|
||||
}}
|
||||
onMouseEnter={(e) => {
|
||||
if (currentPage > 0) {
|
||||
e.target.style.background = '#0056b3'
|
||||
e.target.style.transform = 'translateY(-1px)'
|
||||
e.target.style.boxShadow = '0 4px 12px rgba(0, 123, 255, 0.3)'
|
||||
}
|
||||
}}
|
||||
onMouseLeave={(e) => {
|
||||
if (currentPage > 0) {
|
||||
e.target.style.background = '#007bff'
|
||||
e.target.style.transform = 'translateY(0)'
|
||||
e.target.style.boxShadow = 'none'
|
||||
}
|
||||
}}
|
||||
>
|
||||
← Previous
|
||||
</Button>
|
||||
|
||||
<div
|
||||
style={{
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
gap: '8px',
|
||||
fontSize: '14px',
|
||||
fontWeight: '500',
|
||||
color: '#495057'
|
||||
}}
|
||||
>
|
||||
<span style={{ color: '#007bff', fontWeight: '600' }}>
|
||||
{currentPage + 1}
|
||||
</span>
|
||||
<span style={{ color: '#6c757d' }}>of</span>
|
||||
<span style={{ color: '#495057', fontWeight: '600' }}>
|
||||
{totalPages}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<Button
|
||||
variant='outline-primary'
|
||||
size='sm'
|
||||
onClick={handleNextPage}
|
||||
disabled={currentPage >= totalPages - 1}
|
||||
style={{
|
||||
borderRadius: '20px',
|
||||
padding: '8px 16px',
|
||||
border: '2px solid #007bff',
|
||||
background: currentPage >= totalPages - 1 ? 'transparent' : '#007bff',
|
||||
color: currentPage >= totalPages - 1 ? '#6c757d' : 'white',
|
||||
fontWeight: '500',
|
||||
fontSize: '14px',
|
||||
transition: 'all 0.3s ease',
|
||||
minWidth: '80px',
|
||||
opacity: currentPage >= totalPages - 1 ? 0.5 : 1,
|
||||
cursor: currentPage >= totalPages - 1 ? 'not-allowed' : 'pointer'
|
||||
}}
|
||||
onMouseEnter={(e) => {
|
||||
if (currentPage < totalPages - 1) {
|
||||
e.target.style.background = '#0056b3'
|
||||
e.target.style.transform = 'translateY(-1px)'
|
||||
e.target.style.boxShadow = '0 4px 12px rgba(0, 123, 255, 0.3)'
|
||||
}
|
||||
}}
|
||||
onMouseLeave={(e) => {
|
||||
if (currentPage < totalPages - 1) {
|
||||
e.target.style.background = '#007bff'
|
||||
e.target.style.transform = 'translateY(0)'
|
||||
e.target.style.boxShadow = 'none'
|
||||
}
|
||||
}}
|
||||
>
|
||||
Next →
|
||||
</Button>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{!offersAreLoaded && (
|
||||
<Row className='d-block text-center'>
|
||||
<Spinner animation='border' variant='primary' style={{ maegin: '0 auto' }} />
|
||||
|
||||
@@ -7,11 +7,18 @@
|
||||
|
||||
// Global npm libraries
|
||||
import React, { useEffect, useState } from 'react'
|
||||
import { Button, Modal, Container, Row, Col } from 'react-bootstrap'
|
||||
import { Button, Modal, Container, Row, Col, Spinner } from 'react-bootstrap'
|
||||
import axios from 'axios'
|
||||
|
||||
// Local libraries
|
||||
import config from '../../../config'
|
||||
// Global variables and constants
|
||||
const SERVER = config.dexServer
|
||||
|
||||
function InfoButton (props) {
|
||||
const [show, setShow] = useState(false)
|
||||
const [mutableDataCid, setMutableDataCid] = useState(null)
|
||||
const [loading, setLoading] = useState(false)
|
||||
|
||||
const handleClose = () => {
|
||||
console.log('handleClose()')
|
||||
@@ -36,7 +43,7 @@ function InfoButton (props) {
|
||||
// Get token user data if it exists and verify if it contains media or markdown
|
||||
useEffect(() => {
|
||||
try {
|
||||
const userDataStr = props.token.tokenData.userData
|
||||
const userDataStr = props.token.userData
|
||||
if (userDataStr) {
|
||||
const userData = JSON.parse(userDataStr)
|
||||
|
||||
@@ -50,6 +57,22 @@ function InfoButton (props) {
|
||||
}
|
||||
}, [props.token, show])
|
||||
|
||||
// Update offer data
|
||||
const updateOffer = async () => {
|
||||
try {
|
||||
setLoading(true)
|
||||
const inputObj = { tokenId: props.token.tokenId }
|
||||
const result = await axios.post(`${SERVER}/offer/mutable/sync/`, inputObj)
|
||||
const offerData = result.data
|
||||
console.log('offerData: ', offerData)
|
||||
|
||||
if (props.updateOffer) await props.updateOffer(offerData)
|
||||
setLoading(false)
|
||||
} catch (error) {
|
||||
setLoading(false)
|
||||
}
|
||||
}
|
||||
|
||||
// Replace with dummy button until token data is loaded.
|
||||
if (!props.token.tokenData) {
|
||||
return (
|
||||
@@ -105,6 +128,7 @@ function InfoButton (props) {
|
||||
href={`/user-data/${props.token.tokenId}#single-view`}
|
||||
target='_blank'
|
||||
rel='noopener noreferrer'
|
||||
variant='success'
|
||||
>
|
||||
View User Data
|
||||
</Button>
|
||||
@@ -114,7 +138,10 @@ function InfoButton (props) {
|
||||
|
||||
</Container>
|
||||
</Modal.Body>
|
||||
<Modal.Footer />
|
||||
<Modal.Footer style={{ justifyContent: 'center' }}>
|
||||
{!loading && <Button style={{ width: '135px' }} onClick={updateOffer}>Update</Button>}
|
||||
{loading && <Spinner />}
|
||||
</Modal.Footer>
|
||||
</Modal>
|
||||
</>
|
||||
)
|
||||
|
||||
@@ -20,6 +20,7 @@ function TokenCard (props) {
|
||||
|
||||
// Update icon state every token.icon and token.tokenData changes
|
||||
useEffect(() => {
|
||||
console.log('setting icon')
|
||||
setIcon(token.icon)
|
||||
setTokenData(token.tokenData)
|
||||
}, [token.icon, token.tokenData])
|
||||
@@ -66,7 +67,7 @@ function TokenCard (props) {
|
||||
|
||||
<Row className='text-center'>
|
||||
<Col>
|
||||
<InfoButton token={token} disabled={!token.tokenData} />
|
||||
<InfoButton token={token} disabled={!token.tokenData} {...props} />
|
||||
</Col>
|
||||
|
||||
{!hideBuyBtn && (
|
||||
|
||||
@@ -12,6 +12,8 @@ import ChatSidebar from './chat-sidebar'
|
||||
import ChatMain from './chat-main'
|
||||
import config from '../../../config'
|
||||
|
||||
// Global variables and constants
|
||||
|
||||
function NostrChat (props) {
|
||||
const { appData } = props
|
||||
const { nostrQueries, bchWalletState, startChannelChat } = appData
|
||||
@@ -28,6 +30,8 @@ function NostrChat (props) {
|
||||
const [selectedChannel, setSelectedChannel] = useState(null)
|
||||
const [selectedChannelIsDm, setSelectedChannelIsDm] = useState(false)
|
||||
|
||||
const [deletedChats] = useState(appData.deletedChats)
|
||||
|
||||
const profilesRef = useRef({})
|
||||
const dmChannelsRef = useRef([])
|
||||
|
||||
@@ -182,6 +186,9 @@ function NostrChat (props) {
|
||||
// fetch messages when channel selected and channel metadata are loaded
|
||||
if (!selectedChannel || !channelsLoaded || selectedChannelIsDm) return
|
||||
|
||||
// wait for deleted chats
|
||||
if (!deletedChats || !Array.isArray(deletedChats)) return
|
||||
|
||||
// Load messages for group channel
|
||||
const relays = nostrQueries.relays
|
||||
if (relays.length === 0) {
|
||||
@@ -204,7 +211,8 @@ function NostrChat (props) {
|
||||
pool.on('event', (relay, subId, ev) => {
|
||||
console.log('Group post retrieved from ', relay.url, ev.content)
|
||||
const onBlackList = nostrQueries.blackList.find((val) => { return val === ev.pubkey })
|
||||
if (!onBlackList)onMsgRead(ev)
|
||||
const isDeleted = deletedChats.find((val) => { return val.eventId === ev.id })
|
||||
if (!onBlackList && !isDeleted)onMsgRead(ev)
|
||||
})
|
||||
|
||||
return () => {
|
||||
@@ -212,7 +220,7 @@ function NostrChat (props) {
|
||||
console.log('Close existing pool for group channel')
|
||||
pool.close()
|
||||
}
|
||||
}, [onMsgRead, selectedChannel, selectedChannelIsDm, nostrQueries, channelsLoaded])
|
||||
}, [onMsgRead, selectedChannel, selectedChannelIsDm, nostrQueries, channelsLoaded, deletedChats])
|
||||
|
||||
// Handle nostr pool for dm channels
|
||||
useEffect(() => {
|
||||
|
||||
@@ -11,14 +11,13 @@
|
||||
*/
|
||||
|
||||
import React, { useState, useEffect, useCallback } from 'react'
|
||||
import { Container, Spinner, Dropdown } from 'react-bootstrap'
|
||||
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
|
||||
import { faFilter } from '@fortawesome/free-solid-svg-icons'
|
||||
import { Container, Spinner } from 'react-bootstrap'
|
||||
import axios from 'axios'
|
||||
|
||||
// Local libraries
|
||||
import config from '../../../../config'
|
||||
import ContentCard from './content-card'
|
||||
import FilterDropdown from './filter-dropdown'
|
||||
|
||||
// Global variables and constants
|
||||
const SERVER = config.dexServer
|
||||
@@ -101,24 +100,10 @@ function ContentCreators (props) {
|
||||
</div>
|
||||
|
||||
<div className='mb-4 d-flex justify-content-end'>
|
||||
<Dropdown>
|
||||
<Dropdown.Toggle variant='outline-secondary' className='d-flex align-items-center gap-2'>
|
||||
<FontAwesomeIcon icon={faFilter} />
|
||||
<span>{selectedFilter}</span>
|
||||
</Dropdown.Toggle>
|
||||
|
||||
<Dropdown.Menu>
|
||||
<Dropdown.Item onClick={() => setSelectedFilter('Most Followers')}>
|
||||
Most Followers
|
||||
</Dropdown.Item>
|
||||
<Dropdown.Item onClick={() => setSelectedFilter('Most Tokens')}>
|
||||
Most Tokens
|
||||
</Dropdown.Item>
|
||||
<Dropdown.Item onClick={() => setSelectedFilter('Most Likes')}>
|
||||
Most Likes
|
||||
</Dropdown.Item>
|
||||
</Dropdown.Menu>
|
||||
</Dropdown>
|
||||
<FilterDropdown
|
||||
selectedFilter={selectedFilter}
|
||||
setSelectedFilter={setSelectedFilter}
|
||||
/>
|
||||
</div>
|
||||
|
||||
{!loaded && (
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
import React from 'react'
|
||||
import { Dropdown } from 'react-bootstrap'
|
||||
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
|
||||
import { faFilter } from '@fortawesome/free-solid-svg-icons'
|
||||
|
||||
function FilterDropdown (props) {
|
||||
const { selectedFilter, setSelectedFilter } = props
|
||||
|
||||
return (
|
||||
<Dropdown>
|
||||
<Dropdown.Toggle variant='outline-secondary' className='d-flex align-items-center gap-2'>
|
||||
<FontAwesomeIcon icon={faFilter} />
|
||||
<span>{selectedFilter}</span>
|
||||
</Dropdown.Toggle>
|
||||
|
||||
<Dropdown.Menu>
|
||||
<Dropdown.Item onClick={() => setSelectedFilter('Most Followers')}>
|
||||
Most Followers
|
||||
</Dropdown.Item>
|
||||
<Dropdown.Item onClick={() => setSelectedFilter('Most Tokens')}>
|
||||
Most Tokens
|
||||
</Dropdown.Item>
|
||||
<Dropdown.Item onClick={() => setSelectedFilter('Most Likes')}>
|
||||
Most Likes
|
||||
</Dropdown.Item>
|
||||
</Dropdown.Menu>
|
||||
</Dropdown>
|
||||
)
|
||||
}
|
||||
|
||||
export default FilterDropdown
|
||||
@@ -3,24 +3,56 @@ Component for read nostr information.
|
||||
*/
|
||||
|
||||
// Global npm libraries
|
||||
import React, { useState } from 'react'
|
||||
import React, { useState, useCallback, useEffect } from 'react'
|
||||
import config from '../../../../config/index.js'
|
||||
import { Container } from 'react-bootstrap'
|
||||
import ProfileRead from './profile-read.js'
|
||||
import PublicRead from './public-read.js'
|
||||
import { useParams } from 'react-router-dom'
|
||||
import SlpTokensDisplay from './slp-tokens-display'
|
||||
import NFTForSale from './nft-for-sale.js'
|
||||
import axios from 'axios'
|
||||
|
||||
function Profile (props) {
|
||||
const { wallet, bchWalletState } = props.appData
|
||||
const { nostrKeyPair } = bchWalletState
|
||||
const [profile, setProfile] = useState(false)
|
||||
const [profileAddresses, setProfileAddresses] = useState(null)
|
||||
const { npub } = useParams()
|
||||
console.log('npub', npub)
|
||||
|
||||
const getAddressByNpub = useCallback(async () => {
|
||||
try {
|
||||
// Validate if provided npub match with user npub
|
||||
if (npub === nostrKeyPair.npub) {
|
||||
// Use user addresses
|
||||
setProfileAddresses({
|
||||
bchAddr: bchWalletState.cashAddress,
|
||||
slpAddr: bchWalletState.slpAddress
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
// Fetch addresses for external npub.
|
||||
const url = `${config.dexServer}/sm/npub/${npub}`
|
||||
const response = await axios.get(url)
|
||||
const bchAddr = response.data.bchAddr
|
||||
const slpAddr = wallet.bchjs.SLP.Address.toSLPAddress(bchAddr)
|
||||
setProfileAddresses({ bchAddr, slpAddr })
|
||||
} catch (error) {
|
||||
console.error(error)
|
||||
}
|
||||
}, [npub, wallet, nostrKeyPair, bchWalletState])
|
||||
|
||||
useEffect(() => {
|
||||
getAddressByNpub()
|
||||
}, [getAddressByNpub])
|
||||
return (
|
||||
<>
|
||||
<Container>
|
||||
<ProfileRead {...props} onProfileRead={setProfile} npub={npub} />
|
||||
<PublicRead {...props} profile={profile} npub={npub} />
|
||||
<SlpTokensDisplay {...props} npub={npub} />
|
||||
<NFTForSale {...props} npub={npub} />
|
||||
<ProfileRead {...props} onProfileRead={setProfile} npub={npub} profileAddresses={profileAddresses} />
|
||||
<PublicRead {...props} profile={profile} npub={npub} profileAddresses={profileAddresses} />
|
||||
<SlpTokensDisplay {...props} npub={npub} profileAddresses={profileAddresses} />
|
||||
{profileAddresses && <NFTForSale {...props} npub={npub} profileAddresses={profileAddresses} />}
|
||||
</Container>
|
||||
</>
|
||||
)
|
||||
|
||||
@@ -8,7 +8,7 @@ import axios from 'axios'
|
||||
import TokenCard from '../../nfts-for-sale/token-card'
|
||||
|
||||
function NFTForSale (props) {
|
||||
const { appData, npub } = props
|
||||
const { appData, profileAddresses } = props
|
||||
|
||||
const [offers, setOffers] = useState([])
|
||||
const [offersAreLoaded, setOffersAreLoaded] = useState(false)
|
||||
@@ -16,16 +16,8 @@ function NFTForSale (props) {
|
||||
const [dataAreLoaded, setDataAreLoaded] = useState(false)
|
||||
const [startAsync, setStartAsync] = useState(false)
|
||||
|
||||
const getAddressByNpub = useCallback(async () => {
|
||||
const url = `${config.dexServer}/sm/npub/${npub}`
|
||||
const response = await axios.get(url)
|
||||
const addr = response.data.bchAddr
|
||||
return addr
|
||||
}, [npub])
|
||||
|
||||
// Handler for refresh button
|
||||
const handleRefresh = () => {
|
||||
console.log('handle refresh')
|
||||
loadNftOffers()
|
||||
}
|
||||
|
||||
@@ -52,8 +44,10 @@ function NFTForSale (props) {
|
||||
const getNftOffers = useCallback(async (page = 0) => {
|
||||
try {
|
||||
setOffersAreLoaded(false)
|
||||
const addr = await getAddressByNpub(npub)
|
||||
const url = `${config.dexServer}/offer/list/addr/${addr}`
|
||||
const { bchAddr } = profileAddresses
|
||||
if (!bchAddr) return
|
||||
|
||||
const url = `${config.dexServer}/offer/list/addr/${bchAddr}`
|
||||
const result = await axios.get(url)
|
||||
const rawOffers = result.data
|
||||
console.log('rawOffers: ', rawOffers)
|
||||
@@ -74,7 +68,7 @@ function NFTForSale (props) {
|
||||
setOffersAreLoaded(true)
|
||||
throw err
|
||||
}
|
||||
}, [processTokenData, getAddressByNpub, npub])
|
||||
}, [processTokenData, profileAddresses])
|
||||
|
||||
// This function loads the token data .
|
||||
const lazyLoadTokenData = useCallback(async (tokens) => {
|
||||
@@ -151,7 +145,7 @@ function NFTForSale (props) {
|
||||
if (iconUrl) {
|
||||
// Set the icon url to the token , this can be used to display the icon in the token card component.
|
||||
thisToken.icon = iconUrl
|
||||
thisToken.tokenData.userData = userData
|
||||
thisToken.userData = userData
|
||||
}
|
||||
|
||||
// Mark token to prevent fetch token icon again.
|
||||
@@ -199,6 +193,7 @@ function NFTForSale (props) {
|
||||
// Main function to load NFT offers
|
||||
const loadNftOffers = useCallback(async () => {
|
||||
try {
|
||||
if (!profileAddresses?.bchAddr) return
|
||||
// Get tokens in offers
|
||||
const offers = await getNftOffers()
|
||||
console.log('offers: ', offers)
|
||||
@@ -216,7 +211,7 @@ function NFTForSale (props) {
|
||||
} catch (err) {
|
||||
console.error('Error loading NFT offers:', err)
|
||||
}
|
||||
}, [lazyLoadTokenData, lazyLoadMutableData, getNftOffers, reviewNftCachedData, updateNFTCachedData])
|
||||
}, [lazyLoadTokenData, lazyLoadMutableData, getNftOffers, reviewNftCachedData, updateNFTCachedData, profileAddresses])
|
||||
|
||||
// Effect to load NFTs on component mount
|
||||
useEffect(() => {
|
||||
|
||||
@@ -16,8 +16,7 @@ import { useNavigate } from 'react-router-dom'
|
||||
import NostrFormat from '../nostr-format'
|
||||
|
||||
function ProfileRead (props) {
|
||||
const { npub, appData } = props
|
||||
const { onProfileRead } = props
|
||||
const { npub, appData, onProfileRead, profileAddresses } = props
|
||||
const [profile, setProfile] = useState({})
|
||||
const [pubKey, setPubKey] = useState({})
|
||||
|
||||
@@ -118,6 +117,32 @@ function ProfileRead (props) {
|
||||
</span>
|
||||
<CopyOnClick walletProp='npub' appData={props.appData} value={npub} />
|
||||
</div>
|
||||
{profileAddresses?.bchAddr && (
|
||||
<div className='text-muted small mb-3 d-flex align-items-center flex-column flex-md-row'>
|
||||
<span className='text-truncate me-2 mb-2 mb-md-0'>
|
||||
<span className='d-md-none'>
|
||||
{`${profileAddresses?.bchAddr?.slice(0, 8)}...${profileAddresses?.bchAddr?.slice(-5)}`}
|
||||
</span>
|
||||
<span className='d-none d-md-inline'>
|
||||
{profileAddresses?.bchAddr}
|
||||
</span>
|
||||
</span>
|
||||
<CopyOnClick walletProp='bchAddr' appData={props.appData} value={profileAddresses?.bchAddr} />
|
||||
</div>
|
||||
)}
|
||||
{profileAddresses?.slpAddr && (
|
||||
<div className='text-muted small mb-3 d-flex align-items-center flex-column flex-md-row'>
|
||||
<span className='text-truncate me-2 mb-2 mb-md-0'>
|
||||
<span className='d-md-none'>
|
||||
{`${profileAddresses?.slpAddr?.slice(0, 8)}...${profileAddresses?.slpAddr?.slice(-5)}`}
|
||||
</span>
|
||||
<span className='d-none d-md-inline'>
|
||||
{profileAddresses?.slpAddr}
|
||||
</span>
|
||||
</span>
|
||||
<CopyOnClick walletProp='slpAddr' appData={props.appData} value={profileAddresses?.slpAddr} />
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* About Section */}
|
||||
{profile.about && (
|
||||
|
||||
@@ -14,8 +14,8 @@ function SignMessage (props) {
|
||||
|
||||
const [sign, setSign] = useState('')
|
||||
const [msg, setMsg] = useState('')
|
||||
const [bchAddr] = useState(wallet.walletInfo.cashAddress)
|
||||
const [slpAddr] = useState(wallet.walletInfo.slpAddress)
|
||||
const [bchAddr] = useState(wallet?.walletInfo?.cashAddress)
|
||||
const [slpAddr] = useState(wallet?.walletInfo?.slpAddress)
|
||||
const [err, setErr] = useState('')
|
||||
const [copied, setCopied] = useState(false)
|
||||
|
||||
|
||||
@@ -13,11 +13,17 @@ import TokenCard from './token-card'
|
||||
import RefreshTokenBalance from './refresh-tokens'
|
||||
|
||||
const SlpTokens = (props) => {
|
||||
const [appData, setAppData] = useState(props.appData)
|
||||
const { appData } = props
|
||||
const [iconsAreLoaded, setIconsAreLoaded] = useState(false)
|
||||
const [dataAreLoaded, setDataAreLoaded] = useState(false)
|
||||
const [tokens, setTokens] = useState([])
|
||||
|
||||
const refreshTokenButtonRef = React.useRef()
|
||||
const { slpInitLoaded, asyncBackgroundFinished } = props.appData.asyncBackGroundInitState
|
||||
|
||||
// Background bch data loaded finished
|
||||
const backgroundDataLoaded = slpInitLoaded || asyncBackgroundFinished
|
||||
const backgroundDataError = !slpInitLoaded && asyncBackgroundFinished
|
||||
|
||||
// Update the tokens state when the appData changes
|
||||
useEffect(() => {
|
||||
@@ -30,8 +36,7 @@ const SlpTokens = (props) => {
|
||||
// within the wallet app.
|
||||
// This function triggers the on-click function within the refresh-tokens.js button.
|
||||
const refreshTokens = async () => {
|
||||
const newAppData = await refreshTokenButtonRef.current.handleRefreshTokenBalance()
|
||||
setAppData(newAppData)
|
||||
await refreshTokenButtonRef.current.handleRefreshTokenBalance()
|
||||
}
|
||||
|
||||
// Get Cid from url
|
||||
@@ -44,37 +49,68 @@ const SlpTokens = (props) => {
|
||||
return url
|
||||
}
|
||||
|
||||
// This function loads the token data .
|
||||
const lazyLoadTokenData = useCallback(async (tokens) => {
|
||||
try {
|
||||
setDataAreLoaded(false)
|
||||
// map each token and fetch the token data
|
||||
for (let i = 0; i < tokens.length; i++) {
|
||||
const thisToken = tokens[i]
|
||||
|
||||
// data does not need to be downloaded, so continue with the next one
|
||||
if (thisToken.dataAlreadyDownloaded) continue
|
||||
|
||||
// Try to get token data.
|
||||
const tokenData = await appData.wallet.getTokenData(thisToken.tokenId)
|
||||
console.log('tokenData', tokenData)
|
||||
if (tokenData) {
|
||||
// Set data to the token object , this can be used to display the token name in the token card component.
|
||||
thisToken.tokenData = tokenData
|
||||
}
|
||||
|
||||
// Mark token to prevent fetch token data again.
|
||||
thisToken.dataAlreadyDownloaded = true
|
||||
}
|
||||
|
||||
setDataAreLoaded(true)
|
||||
} catch (error) {
|
||||
setDataAreLoaded(true)
|
||||
}
|
||||
}, [appData])
|
||||
|
||||
// Fetch mutable data if it exist and get the token icon url
|
||||
const fetchTokenIcon = useCallback(async (token) => {
|
||||
const fetchTokenMutableData = useCallback(async (token) => {
|
||||
try {
|
||||
// Get the token data
|
||||
const tokenData = await appData.wallet.getTokenData(token.tokenId)
|
||||
const tokenData = token.tokenData
|
||||
|
||||
if (!tokenData.mutableData) return false // Return false if no mutable data
|
||||
|
||||
// Get the token icon from the mutable data
|
||||
const cid = parseCid(tokenData.mutableData)
|
||||
console.log('mutable data cid', cid)
|
||||
|
||||
const { json } = await appData.wallet.cid2json({ cid })
|
||||
|
||||
console.log('json: ', json)
|
||||
if (!json) return false
|
||||
|
||||
const iconUrl = json.tokenIcon
|
||||
let iconUrl = json.tokenIcon
|
||||
|
||||
if (json.fullSizedUrl && json.fullSizedUrl.includes('http')) {
|
||||
iconUrl = json.fullSizedUrl
|
||||
}
|
||||
const userData = json.userData
|
||||
// Return icon url
|
||||
return iconUrl
|
||||
return { iconUrl, userData }
|
||||
} catch (error) {
|
||||
return false
|
||||
}
|
||||
}, [appData])
|
||||
|
||||
// This function loads the token icons from the ipfs gateways.
|
||||
const lazyLoadTokenIcons = useCallback(async () => {
|
||||
const lazyLoadMutableData = useCallback(async (tokens) => {
|
||||
try {
|
||||
setIconsAreLoaded(false)
|
||||
|
||||
const tokens = appData.bchWalletState.slpTokens
|
||||
|
||||
setTokens(tokens) // update token state
|
||||
|
||||
// map each token and fetch the icon url
|
||||
for (let i = 0; i < tokens.length; i++) {
|
||||
const thisToken = tokens[i]
|
||||
@@ -83,28 +119,38 @@ const SlpTokens = (props) => {
|
||||
if (thisToken.iconAlreadyDownloaded) continue
|
||||
|
||||
// Try to get token icon url from mutable data.
|
||||
const iconUrl = await fetchTokenIcon(thisToken)
|
||||
const { iconUrl, userData } = await fetchTokenMutableData(thisToken)
|
||||
console.log('iconUrl', iconUrl)
|
||||
if (iconUrl) {
|
||||
// Set the icon url to the token , this can be used to display the icon in the token card component.
|
||||
thisToken.icon = iconUrl
|
||||
thisToken.userData = userData
|
||||
}
|
||||
|
||||
// Mark token to prevent fetch token icon again.
|
||||
thisToken.iconAlreadyDownloaded = true
|
||||
}
|
||||
|
||||
appData.updateBchWalletState({ walletObj: { slpTokens: tokens }, appData })
|
||||
setIconsAreLoaded(true)
|
||||
} catch (error) {
|
||||
setIconsAreLoaded(true)
|
||||
}
|
||||
}, [appData, fetchTokenIcon])
|
||||
}, [fetchTokenMutableData])
|
||||
|
||||
const loadData = useCallback(async () => {
|
||||
const tokens = appData.bchWalletState.slpTokens
|
||||
console.log('tokens', tokens)
|
||||
setTokens(tokens)
|
||||
await lazyLoadTokenData(tokens)
|
||||
await lazyLoadMutableData(tokens)
|
||||
}, [appData, lazyLoadTokenData, lazyLoadMutableData])
|
||||
|
||||
// Start to load the token icons when the component is mounted
|
||||
useEffect(() => {
|
||||
lazyLoadTokenIcons()
|
||||
}, [lazyLoadTokenIcons])
|
||||
if (slpInitLoaded) {
|
||||
loadData()
|
||||
}
|
||||
}, [loadData, slpInitLoaded])
|
||||
|
||||
// Generate the token cards for each token in the wallet.
|
||||
const generateCards = () => {
|
||||
@@ -127,7 +173,7 @@ const SlpTokens = (props) => {
|
||||
<RefreshTokenBalance
|
||||
appData={appData}
|
||||
ref={refreshTokenButtonRef}
|
||||
lazyLoadTokenIcons={lazyLoadTokenIcons}
|
||||
lazyLoadTokenIcons={loadData}
|
||||
/>
|
||||
</Col>
|
||||
<Col xs={6} style={{ textAlign: 'right' }}>
|
||||
@@ -137,17 +183,35 @@ const SlpTokens = (props) => {
|
||||
</Col>
|
||||
</Row>
|
||||
<Row>
|
||||
<Col xs={12} style={{ display: 'flex', justifyContent: 'center', alignItems: 'center' }}>
|
||||
{
|
||||
!iconsAreLoaded && (
|
||||
<div style={{ borderRadius: '10px', backgroundColor: '#f0f0f0', padding: '10px', display: 'flex', justifyContent: 'center', alignItems: 'center', width: 'fit-content' }}>
|
||||
<span style={{ marginRight: '10px' }}>Loading Token Icons </span>
|
||||
<Spinner animation='border' />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
{appData.asyncInitSucceeded && (
|
||||
<Col xs={12} style={{ display: 'flex', justifyContent: 'center', alignItems: 'center' }}>
|
||||
{/** Show spinner info if tokens are loaded but data is not loaded */
|
||||
!backgroundDataLoaded && !backgroundDataError && (
|
||||
<div style={{ borderRadius: '10px', backgroundColor: '#f0f0f0', padding: '10px', display: 'flex', justifyContent: 'center', alignItems: 'center', width: 'fit-content' }}>
|
||||
<span style={{ marginRight: '10px' }}>Loading Tokens </span>
|
||||
<Spinner animation='border' />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
{/** Show spinner info if tokens are loaded but data is not loaded */
|
||||
!backgroundDataError && !dataAreLoaded && tokens.length > 0 && (
|
||||
<div style={{ borderRadius: '10px', backgroundColor: '#f0f0f0', padding: '10px', display: 'flex', justifyContent: 'center', alignItems: 'center', width: 'fit-content' }}>
|
||||
<span style={{ marginRight: '10px' }}>Loading Token Data </span>
|
||||
<Spinner animation='border' />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
{/** Show spinner info if tokens are loaded but icons are not loaded */
|
||||
backgroundDataLoaded && dataAreLoaded && !iconsAreLoaded && (
|
||||
<div style={{ borderRadius: '10px', backgroundColor: '#f0f0f0', padding: '10px', display: 'flex', justifyContent: 'center', alignItems: 'center', width: 'fit-content' }}>
|
||||
<span style={{ marginRight: '10px' }}>Loading Token Icons </span>
|
||||
<Spinner animation='border' />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
</Col>
|
||||
</Col>
|
||||
)}
|
||||
</Row>
|
||||
<br />
|
||||
|
||||
@@ -155,11 +219,16 @@ const SlpTokens = (props) => {
|
||||
{generateCards()}
|
||||
</Row>
|
||||
{/** Display a message if no tokens are found */}
|
||||
{tokens.length === 0 && (
|
||||
{backgroundDataLoaded && !backgroundDataError && tokens.length === 0 && (
|
||||
<Row className='text-center'>
|
||||
<span> No tokens found in wallet </span>
|
||||
</Row>
|
||||
)}
|
||||
{backgroundDataError && (
|
||||
<Row style={{ color: 'red' }} className='text-center'>
|
||||
<span>Tokens could not be loaded! </span>
|
||||
</Row>
|
||||
)}
|
||||
|
||||
</Container>
|
||||
</>
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
*/
|
||||
|
||||
// Global npm libraries
|
||||
import React, { useState } from 'react'
|
||||
import { Button, Modal, Container, Row, Col } from 'react-bootstrap'
|
||||
import React, { useState, useEffect } from 'react'
|
||||
import { Button, Modal, Container, Row, Col, Spinner } from 'react-bootstrap'
|
||||
|
||||
// Takes a string as input. If it matches a pattern for a link, a JSX object is
|
||||
// returned with a link. Otherwise the original string is returned.
|
||||
@@ -29,6 +29,7 @@ function linkIfUrl (url) {
|
||||
|
||||
function InfoButton (props) {
|
||||
const [show, setShow] = useState(false)
|
||||
const [mutableDataCid, setMutableDataCid] = useState(null)
|
||||
|
||||
const handleClose = () => {
|
||||
setShow(false)
|
||||
@@ -45,6 +46,33 @@ function InfoButton (props) {
|
||||
|
||||
// console.log('props.token: ', props.token)
|
||||
|
||||
// Get Cid from url
|
||||
const parseCid = (url) => {
|
||||
// get the cid from the url format 'ipfs://bafybeicem27xbzs65uvbcgykcmscsgln3lmhbfrcoec3gdttkdgtxv5acq
|
||||
if (url && url.includes('ipfs://')) {
|
||||
const cid = url.split('ipfs://')[1]
|
||||
return cid
|
||||
}
|
||||
return url
|
||||
}
|
||||
// Get token user data if it exists and verify if it contains media or markdown
|
||||
useEffect(() => {
|
||||
try {
|
||||
console.log('props token', props.token)
|
||||
const userDataStr = props.token.userData
|
||||
if (userDataStr) {
|
||||
const userData = JSON.parse(userDataStr)
|
||||
|
||||
// If user data contains media or markdown, set the mutable data cid
|
||||
if (userData?.media || userData?.markdown) {
|
||||
setMutableDataCid(parseCid(props.token.tokenData.mutableData))
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
// Do nothing
|
||||
}
|
||||
}, [props.token, show])
|
||||
|
||||
return (
|
||||
<>
|
||||
<Button variant='info' onClick={handleOpen}>Info</Button>
|
||||
@@ -87,6 +115,25 @@ function InfoButton (props) {
|
||||
<Col xs={4}><b>URL</b>:</Col>
|
||||
<Col xs={8}>{url}</Col>
|
||||
</Row>
|
||||
{!props.token.iconAlreadyDownloaded && (
|
||||
<div className='text-center'>
|
||||
<Spinner animation='border' size='sm' />
|
||||
</div>
|
||||
)}
|
||||
{props.token.iconAlreadyDownloaded && mutableDataCid && (
|
||||
<Row style={{ paddingTop: '10px' }}>
|
||||
<Col xs={4}><b>User Data</b>:</Col>
|
||||
<Col xs={8}>
|
||||
<Button
|
||||
href={`/user-data/${props.token.tokenId}#single-view`}
|
||||
target='_blank'
|
||||
rel='noopener noreferrer'
|
||||
>
|
||||
View User Data
|
||||
</Button>
|
||||
</Col>
|
||||
</Row>
|
||||
)}
|
||||
</Container>
|
||||
</Modal.Body>
|
||||
<Modal.Footer />
|
||||
|
||||
@@ -18,6 +18,10 @@ function RefreshTokenBalance ({ appData: initialAppData, ref, lazyLoadTokenIcons
|
||||
const [modalBody, setModalBody] = useState([])
|
||||
const [hideSpinner, setHideSpinner] = useState(false)
|
||||
const [hideWaitingModal, setHideWaitingModal] = useState(true)
|
||||
const { slpInitLoaded, asyncBackgroundFinished } = initialAppData.asyncBackGroundInitState
|
||||
|
||||
// Background bch data loaded finished
|
||||
const backgroundDataLoaded = slpInitLoaded || asyncBackgroundFinished
|
||||
|
||||
// Add a new line to the waiting modal.
|
||||
const addToModal = (inStr) => {
|
||||
@@ -58,6 +62,10 @@ function RefreshTokenBalance ({ appData: initialAppData, ref, lazyLoadTokenIcons
|
||||
appData.updateBchWalletState({ walletObj: walletState, appData })
|
||||
|
||||
const newAppData = { ...appData, bchWalletState: walletState }
|
||||
|
||||
// if slpInitLoaded is 'false', them set as true , to show the new balance.
|
||||
appData.updateBackGroundInitState({ slpInitLoaded: true })
|
||||
|
||||
// Update state
|
||||
setHideWaitingModal(true)
|
||||
setAppData(newAppData)
|
||||
@@ -82,7 +90,7 @@ function RefreshTokenBalance ({ appData: initialAppData, ref, lazyLoadTokenIcons
|
||||
|
||||
return (
|
||||
<>
|
||||
<Button variant='success' onClick={handleRefreshTokenBalance}>
|
||||
<Button variant='success' onClick={handleRefreshTokenBalance} disabled={!backgroundDataLoaded}>
|
||||
<FontAwesomeIcon icon={faRedo} size='lg' /> Refresh
|
||||
</Button>
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ export function UninitializedView (props = {}) {
|
||||
/>
|
||||
{
|
||||
appData.asyncInitFinished
|
||||
? <AppBody menuState={100} wallet={appData.wallet} appData={appData} />
|
||||
? <> <br /><AppBody menuState={100} wallet={appData.wallet} appData={appData} /></>
|
||||
: null
|
||||
}
|
||||
</>
|
||||
|
||||
+34
-1
@@ -47,6 +47,14 @@ function useAppState () {
|
||||
const [denyClose, setDenyClose] = useState(false)
|
||||
const [isSingleView, setIsSingleView] = useState(false)
|
||||
|
||||
// Deleted nostr chats.
|
||||
const [deletedChats, setDeletedChats] = useState([])
|
||||
|
||||
// Background process state
|
||||
const [asyncBackGroundInitState, setAsyncBackGroundInitState] = useState({
|
||||
bchInitLoaded: false, slpInitLoaded: false, asyncBackgroundFinished: false
|
||||
})
|
||||
|
||||
// NFTs for sale stored data to improve performance
|
||||
const [nftForSaleCacheData, setNftForSaleCacheData] = useState(lsState.nftData || {})
|
||||
|
||||
@@ -130,6 +138,7 @@ function useAppState () {
|
||||
setNftForSaleCacheData(allCacheData) // Update the state
|
||||
updateLocalStorage({ nftData: allCacheData }) // Update the local storage
|
||||
}
|
||||
|
||||
// Update relays data
|
||||
function updateRelaysData (relaysData) {
|
||||
setRelaysData(relaysData)
|
||||
@@ -144,6 +153,7 @@ function useAppState () {
|
||||
console.log('writeRelays: ', writeRelays)
|
||||
nostrQueriesRef.current = new NostrQueries({ relays: readRelays })
|
||||
}
|
||||
|
||||
// Restore relays data
|
||||
function restoreRelaysData () {
|
||||
const relaysData = [...localStorageDefault.relays] // Create a new array in order to detect changes
|
||||
@@ -160,6 +170,25 @@ function useAppState () {
|
||||
nostrQueriesRef.current = new NostrQueries({ relays: readRelays })
|
||||
}
|
||||
|
||||
// Update background state
|
||||
function updateBackGroundInitState (inObj = {}) {
|
||||
try {
|
||||
setAsyncBackGroundInitState(oldState => {
|
||||
// console.log('background old state: ', oldState)
|
||||
|
||||
const state = Object.assign({}, oldState, inObj)
|
||||
// console.log('background state: ', state)
|
||||
|
||||
return state
|
||||
})
|
||||
|
||||
// console.log(`New wallet state: ${JSON.stringify(bchWalletState, null, 2)}`)
|
||||
} catch (err) {
|
||||
console.error('Error in App.js updateBackGroundInitState()')
|
||||
throw err
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
serverUrl,
|
||||
setServerUrl,
|
||||
@@ -210,7 +239,11 @@ function useAppState () {
|
||||
readRelays,
|
||||
writeRelays,
|
||||
startChannelChat,
|
||||
setStartChannelChat
|
||||
setStartChannelChat,
|
||||
asyncBackGroundInitState,
|
||||
updateBackGroundInitState,
|
||||
deletedChats,
|
||||
setDeletedChats
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -14,6 +14,9 @@ import { base58_to_binary as base58ToBinary } from 'base58-js'
|
||||
import { bytesToHex } from '@noble/hashes/utils' // already an installed dependency
|
||||
import { getPublicKey } from 'nostr-tools/pure'
|
||||
import * as nip19 from 'nostr-tools/nip19'
|
||||
import config from '../config'
|
||||
|
||||
const SERVER = `${config.dexServer}/`
|
||||
|
||||
class AsyncLoad {
|
||||
constructor () {
|
||||
@@ -90,6 +93,11 @@ class AsyncLoad {
|
||||
// Get the BCH balance of the wallet.
|
||||
async getWalletBchBalance (wallet, updateBchWalletState, appData) {
|
||||
try {
|
||||
/* // Force error for development
|
||||
await sleep(6000)
|
||||
throw new Error('getWalletBchBalance error')
|
||||
*/
|
||||
|
||||
// Get the BCH balance of the wallet.
|
||||
const bchBalance = await wallet.getBalance({ bchAddress: wallet.walletInfo.cashAddress })
|
||||
|
||||
@@ -125,6 +133,10 @@ class AsyncLoad {
|
||||
// Get a list of SLP tokens held by the wallet.
|
||||
async getSlpTokenBalances (wallet, updateBchWalletState, appData) {
|
||||
try {
|
||||
/* // Force error for development
|
||||
await sleep(6000)
|
||||
throw new Error('getSlpTokenBalances error')
|
||||
*/
|
||||
// Get token information from the wallet. This will also initialize the UTXO store.
|
||||
const slpTokens = await wallet.listTokens(wallet.walletInfo.cashAddress)
|
||||
// console.log('slpTokens: ', slpTokens)
|
||||
@@ -324,6 +336,22 @@ class AsyncLoad {
|
||||
throw error
|
||||
}
|
||||
}
|
||||
|
||||
// Get all deleted chats
|
||||
async fetchDeletedChats () {
|
||||
try {
|
||||
const options = {
|
||||
method: 'GET',
|
||||
url: `${SERVER}nostr/deletedChat`
|
||||
}
|
||||
const result = await axios.request(options)
|
||||
const { deletedChats } = result.data
|
||||
return deletedChats
|
||||
} catch (error) {
|
||||
console.error('Error deletedChats: ', error)
|
||||
throw error
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function sleep (ms) {
|
||||
|
||||
Reference in New Issue
Block a user