Merge branch 'main' into fix-telemetry-params

threshold-network · Nov 21, 2023 · 934d1b8 · 934d1b8
2 parents d01c9f6 + 25fd0c8
commit 934d1b8
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/.env b/.env
@@ -2,7 +2,7 @@ REACT_APP_SUPPORTED_CHAIN_ID=1337
 REACT_APP_ETH_HOSTNAME_HTTP=http://localhost:8545
 REACT_APP_ETH_HOSTNAME_WS=ws://localhost:8545
 REACT_APP_MULTICALL_ADDRESS=$MULTICALL_ADDRESS
-REACT_APP_DAPP_DEVELOPMENT_TESTNET_CONTRACTS=false
+REACT_APP_DAPP_DEVELOPMENT_TESTNET_CONTRACTS=$DAPP_DEVELOPMENT_TESTNET_CONTRACTS
 
 REACT_APP_FEATURE_FLAG_TBTC_V2=true
 REACT_APP_FEATURE_FLAG_TBTC_V2_REDEMPTION=true

diff --git a/.env.production b/.env.production
@@ -1,6 +1,7 @@
 REACT_APP_SUPPORTED_CHAIN_ID=$CHAIN_ID
 REACT_APP_ETH_HOSTNAME_HTTP=$ETH_HOSTNAME_HTTP
 REACT_APP_ETH_HOSTNAME_WS=$ETH_HOSTNAME_WS
+REACT_APP_DAPP_DEVELOPMENT_TESTNET_CONTRACTS=$DAPP_DEVELOPMENT_TESTNET_CONTRACTS
 
 REACT_APP_FEATURE_FLAG_TBTC_V2=true
 REACT_APP_FEATURE_FLAG_TBTC_V2_REDEMPTION=true

diff --git a/src/pages/tBTC/Bridge/UnmintDetails.tsx b/src/pages/tBTC/Bridge/UnmintDetails.tsx
@@ -188,7 +188,9 @@ export const UnmintDetails: PageComponent = () => {
       as={BridgeProcessDetailsCard}
       spacing="4"
       // @ts-ignore
-      isProcessCompleted={shouldDisplaySuccessStep}
+      isProcessCompleted={
+        shouldDisplaySuccessStep || shouldForceIsProcessCompleted
+      }
     >
       <BridgeLayoutMainSection>
         {_isFetching && <BridgeProcessDetailsPageSkeleton />}
@@ -198,9 +200,13 @@ export const UnmintDetails: PageComponent = () => {
             <BridgeProcessCardTitle bridgeProcess="unmint" />
             <BridgeProcessCardSubTitle
               display="flex"
-              stepText={shouldDisplaySuccessStep ? "Unminted" : "Unminting"}
+              stepText={
+                shouldDisplaySuccessStep || shouldForceIsProcessCompleted
+                  ? "Unminted"
+                  : "Unminting"
+              }
             >
-              {!shouldDisplaySuccessStep && (
+              {!(shouldDisplaySuccessStep || shouldForceIsProcessCompleted) && (
                 <Box as="span" ml="2">
                   {" "}
                   - In progress...
@@ -341,7 +347,7 @@ export const UnmintDetails: PageComponent = () => {
                   </ListItem>
                 ))}
             </List>
-            {!shouldDisplaySuccessStep && (
+            {!(shouldDisplaySuccessStep || shouldForceIsProcessCompleted) && (
               <BridgeProcessResource
                 title="Minters and Guardians in Optimistic Minting"
                 subtitle="A phased approach with two main roles: Minters and Guardians."

diff --git a/src/threshold-ts/tbtc/index.ts b/src/threshold-ts/tbtc/index.ts
@@ -1041,7 +1041,7 @@ export class TBTC implements ITBTC {
     return (
       !isValidBtcAddress(btcAddress, network) ||
       (!isPublicKeyHashTypeAddress(btcAddress, network) &&
-        !isPayToScriptHashTypeAddress(btcAddress))
+        !isPayToScriptHashTypeAddress(btcAddress, network))
     )
   }
 

diff --git a/src/utils/forms.ts b/src/utils/forms.ts
@@ -106,7 +106,7 @@ export const validateUnmintBTCAddress = (
   } else if (
     !isValidBtcAddress(address, network) ||
     (!isPublicKeyHashTypeAddress(address, network) &&
-      !isPayToScriptHashTypeAddress(address))
+      !isPayToScriptHashTypeAddress(address, network))
   ) {
     return `The BTC address has to start with ${getBridgeBTCSupportedAddressPrefixesText(
       "unmint",