Merge branch 'main' into topup

Author: kpyszkowski

.env.example

@@ -8,9 +8,14 @@ REACT_APP_FEATURE_FLAG_TBTC_V2=true
 REACT_APP_FEATURE_FLAG_TBTC_V2_REDEMPTION=true
 REACT_APP_FEATURE_FLAG_MULTI_APP_STAKING=true
 REACT_APP_FEATURE_FLAG_FEEDBACK_MODULE=false
-REACT_APP_FEATURE_FLAG_POSTHOG=false
-REACT_APP_FEATURE_FLAG_SENTRY=$SENTRY_SUPPORT
 REACT_APP_FEATURE_FLAG_LEDGER_LIVE=true
+
+REACT_APP_FEATURE_FLAG_GOOGLE_TAG_MANAGER=false
+REACT_APP_GOOGLE_TAG_MANAGER_ID=$GOOGLE_TAG_MANAGER_ID
+
+REACT_APP_FEATURE_FLAG_POSTHOG=false
+
+REACT_APP_FEATURE_FLAG_SENTRY=false
 REACT_APP_SENTRY_DSN=$SENTRY_DSN
 
 REACT_APP_ELECTRUM_PROTOCOL=$ELECTRUM_PROTOCOL

.env.production

@@ -7,11 +7,16 @@ REACT_APP_FEATURE_FLAG_TBTC_V2=true
 REACT_APP_FEATURE_FLAG_TBTC_V2_REDEMPTION=true
 REACT_APP_FEATURE_FLAG_MULTI_APP_STAKING=true
 REACT_APP_FEATURE_FLAG_FEEDBACK_MODULE=false
+REACT_APP_FEATURE_FLAG_LEDGER_LIVE=true
+
+REACT_APP_FEATURE_FLAG_GOOGLE_TAG_MANAGER=$GOOGLE_TAG_MANAGER_SUPPORT
+REACT_APP_GOOGLE_TAG_MANAGER_ID=$GOOGLE_TAG_MANAGER_ID
+
 REACT_APP_FEATURE_FLAG_POSTHOG=$POSTHOG_SUPPORT
 REACT_APP_POSTHOG_API_KEY=$POSTHOG_API_KEY
 REACT_APP_POSTHOG_HOSTNAME_HTTP=$POSTHOG_HOSTNAME_HTTP
+
 REACT_APP_FEATURE_FLAG_SENTRY=$SENTRY_SUPPORT
-REACT_APP_FEATURE_FLAG_LEDGER_LIVE=true
 REACT_APP_SENTRY_DSN=$SENTRY_DSN
 
 REACT_APP_ELECTRUM_PROTOCOL=$ELECTRUM_PROTOCOL

.github/workflows/dashboard-mainnet.yml

@@ -58,6 +58,8 @@ jobs:
           SENTRY_SUPPORT: true
           SENTRY_DSN: ${{ secrets.MAINNET_SENTRY_DSN }}
           WALLET_CONNECT_PROJECT_ID: ${{ secrets.WALLET_CONNECT_PROJECT_ID }}
+          GOOGLE_TAG_MANAGER_SUPPORT: false
+          GOOGLE_TAG_MANAGER_ID: ${{ secrets.GOOGLE_TAG_MANAGER_ID }}
 
       - name: Build
         if: github.event_name == 'release'
@@ -77,6 +79,8 @@ jobs:
           SENTRY_SUPPORT: true
           SENTRY_DSN: ${{ secrets.MAINNET_SENTRY_DSN }}
           WALLET_CONNECT_PROJECT_ID: ${{ secrets.WALLET_CONNECT_PROJECT_ID }}
+          GOOGLE_TAG_MANAGER_SUPPORT: true
+          GOOGLE_TAG_MANAGER_ID: ${{ secrets.GOOGLE_TAG_MANAGER_ID }}
 
       - uses: actions/upload-artifact@v3
         with:

.github/workflows/reusable-build-and-publish.yml

@@ -138,7 +138,7 @@ jobs:
       - name: Resolve contracts
         shell: bash
         run: |
-          yarn upgrade \
+          yarn upgrade --ignore-scripts \
             @threshold-network/solidity-contracts@${{ steps.set-packages-versions.outputs.threshold-contracts-version }} \
             @keep-network/keep-core@${{ inputs.environment }} \
             @keep-network/keep-ecdsa@${{ inputs.environment }} \

README.md

@@ -56,7 +56,7 @@ git config --global url."https://".insteadOf git://
 
 Ref: https://github.com/keep-network/tbtc-v2/pull/403
 
-Instead of the goerli contracts above you can also use `dapp-development-sepolia` contracts. They offer shorter durations for some specific elements in the contracts in comparison to goerli/mainnet and also allow to manually control mint and unmint process of tbtc-v2 (for more information see please see https://github.com/keep-network/tbtc-v2/pull/403) To install sepolia-dev contracts run:
+Instead of the `sepolia` contracts above you can also use `dapp-development-sepolia` contracts. They offer shorter durations for some specific elements in the contracts in comparison to `sepolia`/`mainnet` and also allow to manually control mint and unmint process of `tbtc-v2` (for more information see please see https://github.com/keep-network/tbtc-v2/pull/403). To install sepolia-dev contracts run:
 
 ```
 yarn @keep-network/keep-core@sepolia \
@@ -118,8 +118,14 @@ REACT_APP_FEATURE_FLAG_TBTC_V2=true
 REACT_APP_FEATURE_FLAG_TBTC_V2_REDEMPTION=true
 REACT_APP_FEATURE_FLAG_MULTI_APP_STAKING=true
 REACT_APP_FEATURE_FLAG_FEEDBACK_MODULE=false
+REACT_APP_FEATURE_FLAG_LEDGER_LIVE=true
+
+REACT_APP_FEATURE_FLAG_GOOGLE_TAG_MANAGER=false
+REACT_APP_GOOGLE_TAG_MANAGER_ID=$GOOGLE_TAG_MANAGER_ID
+
 REACT_APP_FEATURE_FLAG_POSTHOG=false
-REACT_APP_FEATURE_FLAG_SENTRY=$SENTRY_SUPPORT
+
+REACT_APP_FEATURE_FLAG_SENTRY=false
 REACT_APP_SENTRY_DSN=$SENTRY_DSN
 
 REACT_APP_ELECTRUM_PROTOCOL=wss

package.json

@@ -1,6 +1,6 @@
 {
   "name": "token-dashboard",
-  "version": "1.15.0-pre",
+  "version": "1.16.0-pre",
   "private": true,
   "engines": {
     "node": ">=16"

src/App.tsx

@@ -62,6 +62,7 @@ import { useSentry } from "./hooks/sentry"
 import { useIsEmbed } from "./hooks/useIsEmbed"
 import TBTC from "./pages/tBTC"
 import { useDetectIfEmbed } from "./hooks/useDetectIfEmbed"
+import { useGoogleTagManager } from "./hooks/google-tag-manager"
 
 const Web3EventHandlerComponent = () => {
   useSubscribeToVendingMachineContractEvents()
@@ -175,6 +176,7 @@ const AppBody = () => {
   }, [dispatch])
 
   useDetectIfEmbed()
+  useGoogleTagManager()
   usePosthog()
   useCheckBonusEligibility()
   useFetchStakingRewards()

src/components/AnnouncementBanner/index.tsx

@@ -14,7 +14,7 @@ import {
 } from "@threshold-network/components"
 import ButtonLink from "../ButtonLink"
 
-export type AnnouncementBannerContainerProps = {
+type AnnouncementBannerContainerProps = {
   variant?: "primary" | "secondary"
   size?: "sm" | "lg"
   hideCloseBtn?: boolean

src/components/Modal/DeauthorizeApplicationModal/InititateDeauthorization.tsx

@@ -43,8 +43,13 @@ const InitiateDeauthorization: FC<
   isOperatorInPool,
   operator,
 }) => {
-  const shouldUpdateOperatorStatusAfterInitiation =
-    isOperatorInPool !== undefined && !isOperatorInPool
+  let shouldUpdateOperatorStatusAfterInitiation
+  if (stakingAppName === "taco") {
+    shouldUpdateOperatorStatusAfterInitiation = false
+  } else {
+    shouldUpdateOperatorStatusAfterInitiation =
+      isOperatorInPool !== undefined && !isOperatorInPool
+  }
   const { sendTransaction } = useInitiateDeauthorization(
     stakingAppName,
     shouldUpdateOperatorStatusAfterInitiation

src/components/Modal/SelectWalletModal/ConnectCoinbase.tsx

@@ -1,7 +1,7 @@
 import React, { FC } from "react"
 import { useWeb3React } from "@web3-react/core"
 import { WalletConnectionModalBase } from "./components"
-import { ConnectionError, WalletType } from "../../../enums"
+import { ConnectionError } from "../../../enums"
 import { coinbaseConnector } from "../../../web3/connectors"
 import CoinbaseStatusAlert from "./components/CoinbaseStatusAlert"
 import { CoinbaseWallet } from "../../../static/icons/CoinbaseWallet"
@@ -34,7 +34,6 @@ const ConnectCoinbase: FC<{ goBack: () => void; closeModal: () => void }> = ({
       tryAgain={
         connectionRejected ? () => activate(coinbaseConnector) : undefined
       }
-      walletType={WalletType.Coinbase}
     >
       <CoinbaseStatusAlert
         connectionRejected={connectionRejected}