diff --git a/dapp/.env b/dapp/.env index 6fa402df3..9c3c6c2af 100644 --- a/dapp/.env +++ b/dapp/.env @@ -13,7 +13,5 @@ VITE_REFERRAL=123 # TODO: Pass this value as an environment variable during the build process. VITE_DEFENDER_RELAYER_WEBHOOK_URL="https://api.defender.openzeppelin.com/actions/a0d6d2e2-ce9c-4619-aa2b-6c874fe97af7/runs/webhook/b1f17c89-8230-46e3-866f-a3213887974c/Sbddsy54cJ6sPg2bLPyuHJ" -VITE_ACRE_SUBGRAPH_URL="https://api.studio.thegraph.com/query/73600/acre/version/latest" - # TODO: Set this env variable in CI. VITE_TBTC_API_ENDPOINT="" diff --git a/dapp/ledger-manifest-testnet.json b/dapp/ledger-manifest-testnet.json index 15e34dba5..12238b7e1 100644 --- a/dapp/ledger-manifest-testnet.json +++ b/dapp/ledger-manifest-testnet.json @@ -23,7 +23,8 @@ "account.list", "message.sign", "transaction.sign", - "transaction.signAndBroadcast" + "transaction.signAndBroadcast", + "bitcoin.getXPub" ], "domains": ["http://*"], "type": "walletApp" diff --git a/dapp/src/components/TransactionModal/ActiveStakingStep/DepositBTCModal.tsx b/dapp/src/components/TransactionModal/ActiveStakingStep/DepositBTCModal.tsx index 51f44bc03..6f29d5952 100644 --- a/dapp/src/components/TransactionModal/ActiveStakingStep/DepositBTCModal.tsx +++ b/dapp/src/components/TransactionModal/ActiveStakingStep/DepositBTCModal.tsx @@ -34,7 +34,7 @@ export default function DepositBTCModal() { const fetchDeposits = useFetchDeposits() const onStakeBTCSuccess = useCallback(() => { - fetchDeposits() + logPromiseFailure(fetchDeposits()) dispatch(setStatus(PROCESS_STATUSES.SUCCEEDED)) }, [dispatch, fetchDeposits]) diff --git a/dapp/src/components/TransactionModal/ActiveStakingStep/StakingErrorModal/index.tsx b/dapp/src/components/TransactionModal/ActiveStakingStep/StakingErrorModal/index.tsx index 0272f7182..fa5e86a52 100644 --- a/dapp/src/components/TransactionModal/ActiveStakingStep/StakingErrorModal/index.tsx +++ b/dapp/src/components/TransactionModal/ActiveStakingStep/StakingErrorModal/index.tsx @@ -21,7 +21,7 @@ export default function StakingErrorModal() { const [isServerError, setIsServerError] = useState(false) const onStakeBTCSuccess = useCallback(() => { - fetchDeposits() + logPromiseFailure(fetchDeposits()) dispatch(setStatus(PROCESS_STATUSES.SUCCEEDED)) }, [dispatch, fetchDeposits]) diff --git a/dapp/src/components/shared/ActivitiesList/ActivitiesListItem.tsx b/dapp/src/components/shared/ActivitiesList/ActivitiesListItem.tsx index 73403a4ed..5f1c2da51 100644 --- a/dapp/src/components/shared/ActivitiesList/ActivitiesListItem.tsx +++ b/dapp/src/components/shared/ActivitiesList/ActivitiesListItem.tsx @@ -25,17 +25,19 @@ type ActivitiesListItemProps = Omit & function ActivitiesListItem(props: ActivitiesListItemProps) { const { amount, status, txHash, type, handleDismiss, ...restProps } = props + const isCompleted = status === "completed" + return ( - {status === "completed" + {isCompleted ? `${type === "withdraw" ? "Unstaking" : "Staking"} completed` : `${type === "withdraw" ? "Unstaking" : "Staking"}...`} @@ -43,7 +45,7 @@ function ActivitiesListItem(props: ActivitiesListItemProps) { - {status === "completed" ? ( + {isCompleted ? (