diff --git a/src/App.tsx b/src/App.tsx index 5a965025..45302454 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -26,6 +26,7 @@ interface Props { isDesktop?: boolean desktopUrl?: string errorReporting?: (err: Error) => void + giftWalletFees?: { bzz: string; dai: string } } const App = ({ @@ -35,6 +36,7 @@ const App = ({ isDesktop, desktopUrl, errorReporting, + giftWalletFees, }: Props): ReactElement => { const mainApp = (
@@ -45,6 +47,7 @@ const App = ({ lockedApiSettings={lockedApiSettings} isDesktop={isDesktop} desktopUrl={desktopUrl} + giftWalletFees={giftWalletFees} > diff --git a/src/pages/giftCode/index.tsx b/src/pages/giftCode/index.tsx index 6cd3b48d..534a917b 100644 --- a/src/pages/giftCode/index.tsx +++ b/src/pages/giftCode/index.tsx @@ -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([]) + const { enqueueSnackbar } = useSnackbar() + const navigate = useNavigate() useEffect(() => { async function mapGiftWallets() { @@ -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...') diff --git a/src/providers/Settings.tsx b/src/providers/Settings.tsx index 5f6aa0fc..4467044a 100644 --- a/src/providers/Settings.tsx +++ b/src/providers/Settings.tsx @@ -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 @@ -52,6 +53,7 @@ interface InitialSettings { isDesktop?: boolean desktopUrl?: string defaultRpcUrl?: string + giftWalletFees?: { bzz: string; dai: string } } interface Props extends InitialSettings { @@ -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, @@ -143,6 +146,7 @@ export function Provider({ children, ...propsSettings }: Props): ReactElement { desktopApiKey, isDesktop, desktopUrl, + propsSettings.giftWalletFees, rpcProvider, rpcProviderUrl, config,