Merge pull request #70 from Permissionless-Software-Foundation/ct-unstable

Syncing with upstream bch-wallet-web-spa

src/App.js

@@ -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)
@@ -133,6 +163,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 +189,7 @@ function App (props) {
       }
     }
     asyncEffect()
-  }, [appData, addToModal, isSignleView])
+  }, [appData, addToModal, isSignleView, backgroundAsync])
 
   return (
     <>

src/components/app-body/bch-send/balance-card.js

@@ -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>
     </>

src/components/app-body/bch-send/refresh-balance.js

@@ -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()
 

src/components/app-body/bch-send/refresh-bch-balance-button.js

@@ -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>
 

src/components/app-body/bch-send/send-card.js

@@ -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>
 

src/components/app-body/nfts-for-sale/filter-dropdown.js

@@ -18,6 +18,9 @@ function FilterDropdown (props) {
       </Dropdown.Toggle>
 
       <Dropdown.Menu>
+        <Dropdown.Item onClick={() => setSelectedFilter('Misc')}>
+          Misc
+        </Dropdown.Item>
         <Dropdown.Item onClick={() => setSelectedFilter('Art')}>
           Art
         </Dropdown.Item>
@@ -30,9 +33,6 @@ function FilterDropdown (props) {
         <Dropdown.Item onClick={() => setSelectedFilter('Download')}>
           Download
         </Dropdown.Item>
-        <Dropdown.Item onClick={() => setSelectedFilter('Misc')}>
-          Misc
-        </Dropdown.Item>
       </Dropdown.Menu>
     </Dropdown>
   )

src/components/app-body/nfts-for-sale/index.js

@@ -36,7 +36,7 @@ function NftsForSale (props) {
   const [dataAreLoaded, setDataAreLoaded] = useState(false)
   const [currentPage, setCurrentPage] = useState(0)
   const [totalPages, setTotalPages] = useState(0)
-  const [selectedFilter, setSelectedFilter] = useState('Art')
+  const [selectedFilter, setSelectedFilter] = useState('Misc')
 
   // Handler for previous page
   const handlePreviousPage = () => {

src/components/app-body/sign/index.js

@@ -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)
 

src/components/app-body/slp-tokens/index.js

@@ -13,12 +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(() => {
@@ -31,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
@@ -135,6 +139,7 @@ const SlpTokens = (props) => {
 
   const loadData = useCallback(async () => {
     const tokens = appData.bchWalletState.slpTokens
+    console.log('tokens', tokens)
     setTokens(tokens)
     await lazyLoadTokenData(tokens)
     await lazyLoadMutableData(tokens)
@@ -142,8 +147,10 @@ const SlpTokens = (props) => {
 
   // Start to load the token icons when the component is mounted
   useEffect(() => {
-    loadData()
-  }, [loadData])
+    if (slpInitLoaded) {
+      loadData()
+    }
+  }, [loadData, slpInitLoaded])
 
   // Generate the token cards for each token in the wallet.
   const generateCards = () => {
@@ -176,25 +183,35 @@ const SlpTokens = (props) => {
           </Col>
         </Row>
         <Row>
-          <Col xs={12} style={{ display: 'flex', justifyContent: 'center', alignItems: 'center' }}>
-            {/** Show spinner info if tokens are loaded but data is not loaded */
-              !dataAreLoaded && (
-                <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 */
-              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>
-              )
-            }
+          {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 />
 
@@ -202,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>
     </>

src/components/app-body/slp-tokens/refresh-tokens.js

@@ -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>
 

src/components/starter-views.js

@@ -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
       }
     </>

src/hooks/state.js

@@ -46,6 +46,10 @@ function useAppState () {
   const [hideSpinner, setHideSpinner] = useState(false)
   const [denyClose, setDenyClose] = useState(false)
   const [isSingleView, setIsSingleView] = useState(false)
+  // 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 +134,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 +149,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 +166,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 +235,9 @@ function useAppState () {
     readRelays,
     writeRelays,
     startChannelChat,
-    setStartChannelChat
+    setStartChannelChat,
+    asyncBackGroundInitState,
+    updateBackGroundInitState
   }
 }
 

src/services/async-load.js

@@ -90,6 +90,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 +130,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)