diff --git a/src/App.js b/src/App.js
index f437617..ac6b774 100644
--- a/src/App.js
+++ b/src/App.js
@@ -14,6 +14,7 @@ import NavMenu from './components/nav-menu'
import useAppState from './hooks/state'
import { UninitializedView, InitializedView } from './components/starter-views'
+const sigleViewPaths = ['/profile']
function App (props) {
// Load all the app state into a single object that can be passed to child
// components.
@@ -30,12 +31,44 @@ function App (props) {
})
}, [])
+ const isSignleView = useCallback(async () => {
+ // Get current path
+ const currentPath = window.location.pathname
+ // Get hash from url
+ const hash = window.location.hash
+ const allowedPath = sigleViewPaths.find((val) => { return currentPath.match(val) })
+
+ if (hash === '#single-view' && allowedPath) {
+ addToModal('Loading minimal-slp-wallet', appData)
+ const asyncLoad = new AsyncLoad()
+ if (!appData.wallet) {
+ await asyncLoad.loadWalletLib()
+ const walletTemp = await asyncLoad.initStarterWallet(appData.serverUrl, appData.lsState.mnemonic, appData)
+ appData.setWallet(walletTemp)
+ }
+
+ // Update Modal State
+ appData.setIsSingleView(true)
+ appData.setHideSpinner(true)
+ appData.setShowStartModal(false)
+ appData.setDenyClose(false)
+
+ /* // Update the startup state.
+ appData.setAsyncInitFinished(true)
+ appData.setAsyncInitSucceeded(false) */
+ return true
+ }
+ return false
+ }, [appData, addToModal])
+
/** Load all required data before component start. */
useEffect(() => {
async function asyncEffect () {
- console.log('asyncInitStarted: ', appData.asyncInitStarted)
+ const singleView = await isSignleView()
- if (!appData.asyncInitStarted) {
+ console.log('asyncInitStarted: ', appData.asyncInitStarted)
+ console.log('is single view : ', singleView)
+ if (!appData.asyncInitStarted && !singleView) {
try {
// Instantiate the async load object.
const asyncLoad = new AsyncLoad()
@@ -112,7 +145,7 @@ function App (props) {
}
}
asyncEffect()
- }, [appData, addToModal])
+ }, [appData, addToModal, isSignleView])
return (
<>
diff --git a/src/components/app-body/nostr/content-creators/content-card.js b/src/components/app-body/nostr/content-creators/content-card.js
index f61135f..c1209d6 100644
--- a/src/components/app-body/nostr/content-creators/content-card.js
+++ b/src/components/app-body/nostr/content-creators/content-card.js
@@ -18,7 +18,7 @@ function ContentCard (props) {
}, [creator.profile])
const goToProfile = () => {
- const profileUrl = `${window.location.origin}/profile/${creator.npub}`
+ const profileUrl = `${window.location.origin}/profile/${creator.npub}#single-view`
window.open(profileUrl, '_blank')
}
diff --git a/src/components/app-body/nostr/profile/profile-read.js b/src/components/app-body/nostr/profile/profile-read.js
index 1ba25e2..d8d2466 100644
--- a/src/components/app-body/nostr/profile/profile-read.js
+++ b/src/components/app-body/nostr/profile/profile-read.js
@@ -13,8 +13,6 @@ import * as nip19 from 'nostr-tools/nip19'
function ProfileRead (props) {
const { npub } = props
- const { bchWalletState } = props.appData
- console.log('npub prop', npub)
const { setProfile } = props
const [post, setPost] = useState({})
const [loaded, setLoaded] = useState(false)
@@ -24,7 +22,6 @@ function ProfileRead (props) {
const start = () => {
const pubHexData = nip19.decode(npub)
const pubHex = pubHexData.data
- console.log('pubhex', pubHex)
const psf = 'wss://nostr-relay.psfoundation.info'
const pool = RelayPool([psf])
@@ -56,7 +53,7 @@ function ProfileRead (props) {
if (!loaded && npub) {
start()
}
- }, [bchWalletState, loaded, setProfile, npub])
+ }, [loaded, setProfile, npub])
const handleImageError = (type) => {
setImageError(prev => ({ ...prev, [type]: true }))
@@ -117,13 +114,13 @@ function ProfileRead (props) {
- {`${bchWalletState.nostrKeyPair.npub.slice(0, 8)}...${bchWalletState.nostrKeyPair.npub.slice(-5)}`}
+ {`${npub?.slice(0, 8)}...${npub?.slice(-5)}`}
- {bchWalletState.nostrKeyPair.npub}
+ {npub}
-
+
{/* About Section */}
diff --git a/src/components/app-body/nostr/profile/public-read.js b/src/components/app-body/nostr/profile/public-read.js
index ea702b1..7b134f5 100644
--- a/src/components/app-body/nostr/profile/public-read.js
+++ b/src/components/app-body/nostr/profile/public-read.js
@@ -79,7 +79,7 @@ function PublicRead (props) {
{props.profile?.name}
- {`${bchWalletState.nostrKeyPair.npub.slice(0, 8)}...${bchWalletState.nostrKeyPair.npub.slice(-5)}`}
+ {`${npub.slice(0, 8)}...${npub.slice(-5)}`}
diff --git a/src/components/app-body/nostr/profile/slp-tokens-display.js b/src/components/app-body/nostr/profile/slp-tokens-display.js
index a503711..72c2bbb 100644
--- a/src/components/app-body/nostr/profile/slp-tokens-display.js
+++ b/src/components/app-body/nostr/profile/slp-tokens-display.js
@@ -91,7 +91,7 @@ function SlpTokensDisplay (props) {
const getTokens = async () => {
try {
const { nostrKeyPair } = bchWalletState
- if (nostrKeyPair.npub === npub) {
+ if (nostrKeyPair?.npub === npub) {
setTokens(bchWalletState.slpTokens)
setLoaded(true)
return
diff --git a/src/components/nav-menu/index.js b/src/components/nav-menu/index.js
index 0fe7d28..6df43ee 100644
--- a/src/components/nav-menu/index.js
+++ b/src/components/nav-menu/index.js
@@ -15,8 +15,7 @@ import Logo from './psf-logo.png'
function NavMenu (props) {
// Get the current path
- const { currentPath, bchWalletState } = props.appData
-
+ const { currentPath, bchWalletState, isSingleView } = props.appData
// Navbar state
const [expanded, setExpanded] = useState(false)
@@ -25,125 +24,130 @@ function NavMenu (props) {
// Collapse the navbar
setExpanded(false)
}
+ const goToHome = () => {
+ if (isSingleView) {
+ window.location.href = '/'
+ }
+ }
return (
<>
-
+
{' '}
DEX
-
-
-
+
+ )}
)
diff --git a/src/hooks/state.js b/src/hooks/state.js
index 9d644f1..44dd63d 100644
--- a/src/hooks/state.js
+++ b/src/hooks/state.js
@@ -39,6 +39,7 @@ function useAppState () {
const [modalBody, setModalBody] = useState([])
const [hideSpinner, setHideSpinner] = useState(false)
const [denyClose, setDenyClose] = useState(false)
+ const [isSingleView, setIsSingleView] = useState(false)
// NFTs for sale stored data to improve performance
const [nftForSaleCacheData, setNftForSaleCacheData] = useState(lsState.nftData || {})
@@ -153,7 +154,9 @@ function useAppState () {
setNftForSaleCacheData,
updateNFTCachedData,
lastFeedTab,
- setLastFeedTab
+ setLastFeedTab,
+ isSingleView,
+ setIsSingleView
}
}
diff --git a/src/services/async-load.js b/src/services/async-load.js
index 0dfcd27..746e0f4 100644
--- a/src/services/async-load.js
+++ b/src/services/async-load.js
@@ -283,6 +283,47 @@ class AsyncLoad {
npub
}
}
+
+ // Initialize the BCH wallet without initialize() promise
+ async initStarterWallet (restURL, mnemonic, appData) {
+ try {
+ const options = {
+ interface: 'consumer-api',
+ restURL,
+ noUpdate: true
+ }
+
+ let wallet
+ if (mnemonic) {
+ // Load the wallet from the mnemonic, if it's available from local storage.
+ wallet = new this.BchWallet(mnemonic, options)
+ } else {
+ // Generate a new mnemonic and wallet.
+ wallet = new this.BchWallet(null, options)
+ }
+
+ await wallet.walletInfoPromise
+
+ // Get Nostr key pair from WIF
+ const nostrKeyPair = this.nostrKeyPairFromWIF(wallet.walletInfo.privateKey)
+ const walletInfo = wallet.walletInfo
+ walletInfo.nostrKeyPair = nostrKeyPair
+ // Update the state of the wallet.
+ appData.updateBchWalletState({ walletObj: walletInfo, appData })
+ // Save the mnemonic to local storage.
+ if (!mnemonic) {
+ const newMnemonic = wallet.walletInfo.mnemonic
+ appData.updateLocalStorage({ mnemonic: newMnemonic })
+ }
+
+ this.wallet = wallet
+
+ return wallet
+ } catch (error) {
+ console.error('Error initStarterWallet: ', error)
+ throw error
+ }
+ }
}
function sleep (ms) {