feat: pass isBeeDesktop as Bee Dashboard component property (#510)

* feat: pass isBeeDesktop as Bee Dashboard component property

* chore: remove console log
This commit is contained in:
Vojtech Simetka
2022-08-02 09:53:50 +02:00
committed by GitHub
parent 72488fd5a3
commit 4c48657fca
13 changed files with 72 additions and 59 deletions
+5 -4
View File
@@ -11,14 +11,15 @@ import ExpandableListItemKey from '../../../components/ExpandableListItemKey'
import { Loading } from '../../../components/Loading'
import { SwarmButton } from '../../../components/SwarmButton'
import TroubleshootConnectionCard from '../../../components/TroubleshootConnectionCard'
import config from '../../../config'
import { CheckState, Context } from '../../../providers/Bee'
import { CheckState, Context as BeeContext } from '../../../providers/Bee'
import { Context as SettingsContext } from '../../../providers/Settings'
import { ROUTES } from '../../../routes'
import { AccountNavigation } from '../AccountNavigation'
import { Header } from '../Header'
export function AccountWallet(): ReactElement {
const { balance, nodeAddresses, nodeInfo, status } = useContext(Context)
const { balance, nodeAddresses, nodeInfo, status } = useContext(BeeContext)
const { isBeeDesktop } = useContext(SettingsContext)
const navigate = useNavigate()
@@ -69,7 +70,7 @@ export function AccountWallet(): ReactElement {
<SwarmButton onClick={onCheckTransactions} iconType={Link}>
Check transactions on Blockscout
</SwarmButton>
{config.BEE_DESKTOP_ENABLED && (
{isBeeDesktop && (
<SwarmButton onClick={onInvite} iconType={Gift}>
Invite to Swarm...
</SwarmButton>
+2 -2
View File
@@ -5,6 +5,7 @@ import ExchangeFunds from 'remixicon-react/ExchangeFundsLineIcon'
import Upload from 'remixicon-react/UploadLineIcon'
import { Context as BeeContext } from '../../providers/Bee'
import { Context as SettingsContext } from '../../providers/Settings'
import Card from '../../components/Card'
import Map from '../../components/Map'
import ExpandableListItem from '../../components/ExpandableListItem'
@@ -12,7 +13,6 @@ import { useNavigate } from 'react-router'
import { ROUTES } from '../../routes'
import { useIsBeeDesktop, useNewBeeDesktopVersion } from '../../hooks/apiHooks'
import { BEE_DESKTOP_LATEST_RELEASE_PAGE } from '../../utils/desktop'
import config from '../../config'
import NodeInfoCard from './NodeInfoCard'
import { chainIdToName } from '../../utils/chain'
@@ -28,7 +28,7 @@ export default function Status(): ReactElement {
chequebookBalance,
wallet,
} = useContext(BeeContext)
const isBeeDesktop = config.BEE_DESKTOP_ENABLED
const { isBeeDesktop } = useContext(SettingsContext)
const { beeDesktopVersion } = useIsBeeDesktop()
const { newBeeDesktopVersion } = useNewBeeDesktopVersion(isBeeDesktop)
const navigate = useNavigate()
+4 -4
View File
@@ -4,7 +4,6 @@ import ExpandableList from '../../components/ExpandableList'
import ExpandableListItemInput from '../../components/ExpandableListItemInput'
import { Context as BeeContext } from '../../providers/Bee'
import { Context as SettingsContext } from '../../providers/Settings'
import config from '../../config'
import { useSnackbar } from 'notistack'
export default function SettingsPage(): ReactElement {
@@ -19,6 +18,7 @@ export default function SettingsPage(): ReactElement {
ensResolver,
providerUrl,
isLoading,
isBeeDesktop,
setAndPersistJsonRpcProvider,
} = useContext(SettingsContext)
const { refresh } = useContext(BeeContext)
@@ -39,13 +39,13 @@ export default function SettingsPage(): ReactElement {
label="Bee API"
value={apiUrl}
onConfirm={setApiUrl}
locked={lockedApiSettings || config.BEE_DESKTOP_ENABLED}
locked={lockedApiSettings || isBeeDesktop}
/>
<ExpandableListItemInput
label="Bee Debug API"
value={apiDebugUrl}
onConfirm={setDebugApiUrl}
locked={lockedApiSettings || config.BEE_DESKTOP_ENABLED}
locked={lockedApiSettings || isBeeDesktop}
/>
<ExpandableListItemInput
label="Blockchain RPC URL"
@@ -65,7 +65,7 @@ export default function SettingsPage(): ReactElement {
}}
/>
</ExpandableList>
{config.BEE_DESKTOP_ENABLED && (
{isBeeDesktop && (
<ExpandableList label="Desktop Settings" defaultOpen>
<ExpandableListItemInput label="CORS" value={cors ?? '-'} locked />
<ExpandableListItemInput label="Data DIR" value={dataDir ?? '-'} locked />
+1 -2
View File
@@ -17,11 +17,10 @@ import { ROUTES } from '../../routes'
import { sleepMs } from '../../utils'
import { restartBeeNode, upgradeToLightNode } from '../../utils/desktop'
import { ResolvedWallet } from '../../utils/wallet'
import config from '../../config'
import { BeeModes } from '@ethersphere/bee-js'
export function GiftCardFund(): ReactElement {
const isBeeDesktop = config.BEE_DESKTOP_ENABLED
const { isBeeDesktop } = useContext(SettingsContext)
const { nodeAddresses, balance, nodeInfo } = useContext(BeeContext)
const { provider, providerUrl } = useContext(SettingsContext)
+1 -2
View File
@@ -22,7 +22,6 @@ import { ROUTES } from '../../routes'
import { sleepMs } from '../../utils'
import { getBzzPriceAsDai, performSwap, restartBeeNode, upgradeToLightNode } from '../../utils/desktop'
import { TopUpProgressIndicator } from './TopUpProgressIndicator'
import config from '../../config'
const MINIMUM_XDAI = '0.1'
const MINIMUM_XBZZ = '0.1'
@@ -39,7 +38,7 @@ export function Swap({ header }: Props): ReactElement {
const { providerUrl } = useContext(SettingsContext)
const { balance, nodeAddresses, nodeInfo } = useContext(BeeContext)
const isBeeDesktop = config.BEE_DESKTOP_ENABLED
const { isBeeDesktop } = useContext(SettingsContext)
const navigate = useNavigate()
const { enqueueSnackbar } = useSnackbar()
+1 -2
View File
@@ -12,7 +12,6 @@ import { SwarmButton } from '../../components/SwarmButton'
import { ROUTES } from '../../routes'
import { CheckState, Context as BeeContext } from '../../providers/Bee'
import { Context as SettingsContext } from '../../providers/Settings'
import config from '../../config'
import { BeeModes } from '@ethersphere/bee-js'
import { restartBeeNode, upgradeToLightNode } from '../../utils/desktop'
import { Loading } from '../../components/Loading'
@@ -39,7 +38,7 @@ const MINIMUM_XBZZ = '0.1'
export default function TopUp(): ReactElement {
const navigate = useNavigate()
const styles = useStyles()
const isBeeDesktop = config.BEE_DESKTOP_ENABLED
const { isBeeDesktop } = useContext(SettingsContext)
const { balance, nodeInfo, status } = useContext(BeeContext)
const { providerUrl } = useContext(SettingsContext)
const [loading, setLoading] = useState(false)