Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ interface Props {
isDesktop?: boolean
desktopUrl?: string
errorReporting?: (err: Error) => void
giftWalletFees?: { bzz: string; dai: string }
}

const App = ({
Expand All @@ -35,6 +36,7 @@ const App = ({
isDesktop,
desktopUrl,
errorReporting,
giftWalletFees,
}: Props): ReactElement => {
const mainApp = (
<div className="App">
Expand All @@ -45,6 +47,7 @@ const App = ({
lockedApiSettings={lockedApiSettings}
isDesktop={isDesktop}
desktopUrl={desktopUrl}
giftWalletFees={giftWalletFees}
>
<TopUpProvider>
<BeeProvider>
Expand Down
18 changes: 10 additions & 8 deletions src/pages/giftCode/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,14 @@ import { createGiftWallet } from '../../utils/desktop'
import { generateWallet } from '../../utils/identity'
import { ResolvedWallet } from '../../utils/wallet'

const GIFT_WALLET_FUND_DAI_AMOUNT = DAI.fromDecimalString('0.1')
const GIFT_WALLET_FUND_BZZ_AMOUNT = BZZ.fromDecimalString('0.5')

export default function Index(): ReactElement {
export default function Index(): ReactElement | null {
const { giftWallets, addGiftWallet } = useContext(TopUpContext)
const { rpcProvider, desktopUrl } = useContext(SettingsContext)
const { rpcProvider, desktopUrl, giftWalletFees } = useContext(SettingsContext)
const { balance } = useContext(BalanceProvider)

const [loading, setLoading] = useState(false)
const [balances, setBalances] = useState<ResolvedWallet[]>([])
const { enqueueSnackbar } = useSnackbar()
const navigate = useNavigate()

useEffect(() => {
async function mapGiftWallets() {
Expand All @@ -45,8 +43,12 @@ export default function Index(): ReactElement {
mapGiftWallets()
}, [giftWallets, rpcProvider])

const { enqueueSnackbar } = useSnackbar()
const navigate = useNavigate()
if (!giftWalletFees) {
return null
}

const GIFT_WALLET_FUND_DAI_AMOUNT = DAI.fromWei(giftWalletFees.dai)
const GIFT_WALLET_FUND_BZZ_AMOUNT = BZZ.fromPLUR(giftWalletFees.bzz)

async function onCreate() {
enqueueSnackbar('Sending funds to gift wallet...')
Expand Down
4 changes: 4 additions & 0 deletions src/providers/Settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ interface ContextInterface {
desktopApiKey: string
isDesktop: boolean
desktopUrl: string
giftWalletFees?: { bzz: string; dai: string }
rpcProviderUrl: string
rpcProvider: JsonRpcProvider | null
cors: string | null
Expand Down Expand Up @@ -52,6 +53,7 @@ interface InitialSettings {
isDesktop?: boolean
desktopUrl?: string
defaultRpcUrl?: string
giftWalletFees?: { bzz: string; dai: string }
}

interface Props extends InitialSettings {
Expand Down Expand Up @@ -126,6 +128,7 @@ export function Provider({ children, ...propsSettings }: Props): ReactElement {
desktopApiKey,
isDesktop,
desktopUrl,
giftWalletFees: propsSettings.giftWalletFees,
rpcProvider,
rpcProviderUrl,
cors: config?.['cors-allowed-origins'] ?? null,
Expand All @@ -143,6 +146,7 @@ export function Provider({ children, ...propsSettings }: Props): ReactElement {
desktopApiKey,
isDesktop,
desktopUrl,
propsSettings.giftWalletFees,
rpcProvider,
rpcProviderUrl,
config,
Expand Down
Loading