prep for release v1.1.0 (#178) · cennznet/app-hub@66a568a

vercel · 2022-04-27T21:43:39Z

Successfully deployed to the following URLs:

app-hub – ./

app-hub.vercel.app
app-hub-git-prod-cennznet.vercel.app
cennzx.io
cennzx.centrality.me
app-hub-cennznet.vercel.app
app.cennz.net
www.cennzx.io

-Original file line number
+Diff line change
@@ Expand Up / @@ -5,3 +5,5 @@ NEXT_PUBLIC_API_URL="wss://nikau.centrality.me/public/ws" @@
     NEXT_PUBLIC_ETH_CHAIN_ID=42
     NEXT_PUBLIC_BRIDGE_RELAYER_URL="https://bridge-contracts.nikau.centrality.me"
     NEXT_PUBLIC_GA_ID="G-8YJT9T1YTT"
+    NEXT_PUBLIC_CENNZ_EXPLORER_URL="https://nikau.uncoverexplorer.com"
+    NEXT_PUBLIC_ETH_EXPLORER_URL="https://kovan.etherscan.io"

-Original file line number
+Diff line change
@@ Expand Up @@
     NEXT_PUBLIC_ETH_CHAIN_ID=1
     NEXT_PUBLIC_BRIDGE_RELAYER_URL="https://bridge-contracts.centralityapp.com"
     NEXT_PUBLIC_GA_ID="G-8YJT9T1YTT"
+    NEXT_PUBLIC_CENNZ_EXPLORER_URL="https://uncoverexplorer.com"
+    NEXT_PUBLIC_ETH_EXPLORER_URL="https://etherscan.io"

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,12 @@ @@
     ## [Unreleased]
+    ## [1.1.0] - 2022-04-28
+    - Update UI when transaction is in progress [#156](https://github.com/cennznet/app-hub/pull/156)
+    - Update UI/UX for historical withdrawals [#171](https://github.com/cennznet/app-hub/pull/171)
+    - Ask user to confirm before exiting if there is a transaction pending [#173](https://github.com/cennznet/app-hub/pull/173)
     ## [1.0.2] - 2022-04-01
     - Add confirming state to the Bridge [#151](https://github.com/cennznet/app-hub/pull/151)
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Commit

There are no files selected for viewing

1 comment on commit `66a568a`

vercel bot commented on `66a568a` Apr 27, 2022

-Original file line number
+Diff line change
@@ -1,245 +1,33 @@
-    import { BridgedEthereumToken, IntrinsicElements } from "@/types";
     import { FC, useCallback, useEffect, useState } from "react";
+    import { IntrinsicElements } from "@/types";
     import SubmitButton from "@/components/shared/SubmitButton";
     import { css } from "@emotion/react";
     import { Theme } from "@mui/material";
     import { useBridge } from "@/providers/BridgeProvider";
     import useBridgeStatus from "@/hooks/useBridgeStatus";
-    import { useCENNZApi } from "@/providers/CENNZApiProvider";
-    import { useMetaMaskWallet } from "@/providers/MetaMaskWalletProvider";
-    import {
-    	Balance,
-    	ensureBridgeDepositActive,
-    	ensureBridgeWithdrawActive,
-    	ensureEthereumChain,
-    	ensureRelayerDepositDone,
-    	sendDepositRequest,
-    	sendWithdrawCENNZRequest,
-    	sendWithdrawEthereumRequest,
-    } from "@/utils";
-    import { useCENNZWallet } from "@/providers/CENNZWalletProvider";
-    import { useMetaMaskExtension } from "@/providers/MetaMaskExtensionProvider";
-    import HistoricalWithdrawal from "@/components/HistoricalWithdrawal";
-    import { EthyEventId } from "@cennznet/types";
-    import { EthEventProof } from "@cennznet/api/derives/ethBridge/types";
+    import BridgeWithdrawAdvanced from "@/components/BridgeWithdrawAdvanced";
+    import { useDepositRequest, useWithdrawRequest } from "@/hooks";
     interface BridgeFormProps {}
     const BridgeForm: FC<IntrinsicElements["form"] & BridgeFormProps> = ({
     	children,
     	...props
     }) => {
-    	const { api } = useCENNZApi();
-    	const { wallet: metaMaskWallet } = useMetaMaskWallet();
-    	const {
-    		bridgeAction,
-    		transferInput,
-    		transferAsset,
-    		transferCENNZAddress,
-    		setProgressStatus,
-    		setSuccessStatus,
-    		setFailStatus,
-    		setTxStatus,
-    		updateMetaMaskBalances,
-    		transferMetaMaskAddress,
-    		historicalBlockHash,
-    		historicalEventProofId,
-    	} = useBridge();
+    	const { bridgeAction } = useBridge();
     	const [buttonLabel, setButtonLabel] = useState<string>("Deposit");
-    	const [advancedExpanded, setAdvancedExpanded] = useState<boolean>(false);
-    	const {
-    		updateBalances: updateCENNZBalances,
-    		selectedAccount: cennzAccount,
-    		wallet: cennzWallet,
-    	} = useCENNZWallet();
-    	const { extension } = useMetaMaskExtension();
+    	const processDepositRequest = useDepositRequest();
-    	const processDepositRequest = useCallback(async () => {
-    		const setTrValue = transferInput.setValue;
-    		const transferAmount = Balance.fromInput(
-    			transferInput.value,
-    			transferAsset
-    		);
-    		setProgressStatus();
-    		let tx: Awaited<ReturnType<typeof sendDepositRequest>>;
-    		try {
-    			await ensureEthereumChain(extension);
-    			await ensureBridgeDepositActive(api, metaMaskWallet);
-    			tx = await sendDepositRequest(
-    				transferAmount,
-    				transferAsset,
-    				transferCENNZAddress,
-    				metaMaskWallet.getSigner()
-    			);
-    			if (tx !== "cancelled")
-    				await ensureRelayerDepositDone(tx.hash, 600000, setProgressStatus);
-    		} catch (error) {
-    			console.info(error);
-    			return setFailStatus(error?.code);
-    		}
-    		if (tx === "cancelled") return setTxStatus(null);
-    		setSuccessStatus();
-    		setTrValue("");
-    		updateMetaMaskBalances();
-    		updateCENNZBalances();
-    	}, [
-    		api,
-    		transferInput,
-    		transferAsset,
-    		transferCENNZAddress,
-    		metaMaskWallet,
-    		setProgressStatus,
-    		setSuccessStatus,
-    		setFailStatus,
-    		setTxStatus,
-    		updateMetaMaskBalances,
-    		updateCENNZBalances,
-    		extension,
-    	]);
-    	const processWithdrawRequest = useCallback(async () => {
-    		const setTrValue = transferInput.setValue;
-    		const transferAmount = Balance.fromInput(
-    			transferInput.value,
-    			transferAsset
-    		);
-    		setProgressStatus();
-    		let eventProof: Awaited<ReturnType<typeof sendWithdrawCENNZRequest>>;
-    		try {
-    			await ensureEthereumChain(extension);
-    			await ensureBridgeWithdrawActive(api, metaMaskWallet);
-    			setProgressStatus("CennznetConfirming");
-    			eventProof = await sendWithdrawCENNZRequest(
-    				api,
-    				transferAmount,
-    				transferAsset as BridgedEthereumToken,
-    				cennzAccount.address,
-    				transferMetaMaskAddress,
-    				cennzWallet.signer
-    			);
-    		} catch (error) {
-    			console.info(error);
-    			return setFailStatus(error?.code);
-    		}
-    		if (eventProof === "cancelled") return setTxStatus(null);
-    		let tx: Awaited<ReturnType<typeof sendWithdrawEthereumRequest>>;
-    		try {
-    			setProgressStatus("EthereumConfirming");
-    			tx = await sendWithdrawEthereumRequest(
-    				api,
-    				eventProof,
-    				transferAmount,
-    				transferAsset as BridgedEthereumToken,
-    				transferMetaMaskAddress,
-    				metaMaskWallet.getSigner()
-    			);
-    		} catch (error) {
-    			console.info(error);
-    			return setFailStatus(error?.code);
-    		}
-    		if (tx === "cancelled") return setTxStatus(null);
-    		setSuccessStatus();
-    		setTrValue("");
-    		updateMetaMaskBalances();
-    		updateCENNZBalances();
-    	}, [
-    		api,
-    		transferAsset,
-    		cennzAccount?.address,
-    		cennzWallet?.signer,
-    		setProgressStatus,
-    		setSuccessStatus,
-    		setFailStatus,
-    		setTxStatus,
-    		transferInput,
-    		transferMetaMaskAddress,
-    		updateMetaMaskBalances,
-    		updateCENNZBalances,
-    		metaMaskWallet,
-    		extension,
-    	]);
-    	const processHistoricalWithdrawRequest = useCallback(async () => {
-    		const setTrValue = transferInput.setValue;
-    		const transferAmount = Balance.fromInput(
-    			transferInput.value,
-    			transferAsset
-    		);
-    		setProgressStatus();
-    		const eventProof: Awaited<EthEventProof> =
-    			await api.derive.ethBridge.eventProof(
-    				historicalEventProofId as unknown as EthyEventId
-    			);
-    		let tx: Awaited<ReturnType<typeof sendWithdrawEthereumRequest>>;
-    		try {
-    			setProgressStatus("EthereumConfirming");
-    			tx = await sendWithdrawEthereumRequest(
-    				api,
-    				eventProof,
-    				transferAmount,
-    				transferAsset as BridgedEthereumToken,
-    				transferMetaMaskAddress,
-    				metaMaskWallet.getSigner(),
-    				historicalBlockHash
-    			);
-    		} catch (error) {
-    			console.info(error);
-    			return setFailStatus(error?.code);
-    		}
-    		if (tx === "cancelled") return setTxStatus(null);
-    		setSuccessStatus();
-    		setTrValue("");
-    		updateMetaMaskBalances();
-    		updateCENNZBalances();
-    		setAdvancedExpanded(false);
-    	}, [
-    		api,
-    		transferAsset,
-    		setProgressStatus,
-    		setSuccessStatus,
-    		setFailStatus,
-    		setTxStatus,
-    		transferInput,
-    		transferMetaMaskAddress,
-    		updateMetaMaskBalances,
-    		updateCENNZBalances,
-    		metaMaskWallet,
-    		historicalBlockHash,
-    		historicalEventProofId,
-    		setAdvancedExpanded,
-    	]);
+    	const processWithdrawRequest = useWithdrawRequest();
     	const onFormSubmit = useCallback(
     		async (event) => {
     			event.preventDefault();
     			if (bridgeAction === "Deposit") return processDepositRequest();
-    			if (bridgeAction === "Withdraw") {
-    				if (advancedExpanded) return processHistoricalWithdrawRequest();
-    				return processWithdrawRequest();
-    			}
+    			if (bridgeAction === "Withdraw") return processWithdrawRequest();
     		},
-    		[
-    			bridgeAction,
-    			processDepositRequest,
-    			processWithdrawRequest,
-    			processHistoricalWithdrawRequest,
-    			advancedExpanded,
-    		]
+    		[bridgeAction, processDepositRequest, processWithdrawRequest]
     	);
     	const status = useBridgeStatus();
@@ Expand All @@
     		<form {...props} css={styles.root} onSubmit={onFormSubmit}>
     			{children}
-    			{bridgeAction === "Withdraw" && (
-    				<HistoricalWithdrawal
-    					expanded={advancedExpanded}
-    					setExpanded={setAdvancedExpanded}
-    				/>
-    			)}
+    			{bridgeAction === "Withdraw" && <BridgeWithdrawAdvanced />}
     			<div css={styles.formSubmit}>
     				<SubmitButton
@@ Expand Down @@

Commit

There are no files selected for viewing

1 comment on commit 66a568a

vercel bot commented on 66a568a Apr 27, 2022

Choose a reason for hiding this comment

app-hub – ./

1 comment on commit `66a568a`

vercel bot commented on `66a568a` Apr 27, 2022