Merge branch 'releases/v1.43.1'

shapeshift · Jul 19, 2022 · 42896e5 · 42896e5
2 parents 5ef91ea + c2c574f
commit 42896e5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/components/Modals/FiatRamps/views/Overview.tsx b/src/components/Modals/FiatRamps/views/Overview.tsx
@@ -112,7 +112,9 @@ export const Overview: React.FC<OverviewProps> = ({
   useEffect(() => {
     if (!wallet) return
     supportsAddressVerifying && setSupportsAddressVerifying(true)
-    setChainId(fromAssetId(selectedAsset?.assetId ?? '').chainId ?? ethChainId)
+    const maybeAssetId = selectedAsset?.assetId
+    const chainId = maybeAssetId ? fromAssetId(maybeAssetId).chainId : ethChainId
+    setChainId(chainId)
     // supportsAddressVerifying will cause infinite loop
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [selectedAsset, setChainId, setSupportsAddressVerifying, wallet])

diff --git a/src/plugins/pendo/components/OptInModal/OptInModalBody.tsx b/src/plugins/pendo/components/OptInModal/OptInModalBody.tsx
@@ -148,7 +148,7 @@ export const OptInModalBody: React.FC<OptInModalProps> = ({ onContinue }) => {
           onClick={handleConfirm}
           data-test='consent-optin-continue-button'
         >
-          <Text translation={'common.connectWallet'} />
+          <Text translation={'common.continue'} />
         </Button>
         <Button
           isFullWidth