Merge pull request #468 from persistenceOne/fix/keystore_login

updating analytics

Author: blackpanther1881

.github/workflows/release.yml

@@ -30,7 +30,7 @@ jobs:
         REACT_APP_CHAIN_ID: 'core-1'
         REACT_APP_CHAIN_NAME: 'Persistence'
         REACT_APP_IBC_CONFIG: 'ibcMainnet.json'
-        REACT_APP_GA_TRACKING_ID: 'UA-219210130-1'
+        REACT_APP_GA_TRACKING_ID: 'G-XQ9NQJL11L'
         REACT_APP_SENTRY_API: 'https://[email protected]/6092403'
     - name: Publish
       uses: cloudflare/[email protected]

package-lock.json

@@ -37,7 +37,7 @@
     "react-bootstrap": "^1.4.3",
     "react-copy-to-clipboard": "^5.0.3",
     "react-dom": "^17.0.1",
-    "react-ga": "^3.3.0",
+    "react-ga4": "^1.4.1",
     "react-i18next": "^11.8.6",
     "react-mailchimp-subscribe": "^2.1.0",
     "react-redux": "^7.2.2",

package.json

@@ -21,7 +21,7 @@ import {keplrLogin, setKeplrInfo} from "./store/actions/signIn/keplr";
 import { KEPLR_ADDRESS, LOGIN_INFO} from "./constants/localStorage";
 import {updateFee} from "./utils/helper";
 import {ledgerDisconnect} from "./utils/ledger";
-import ReactGA from 'react-ga';
+import ReactGA from 'react-ga4';
 import packageJson from "../package.json";
 
 const SENTRY_API = process.env.REACT_APP_SENTRY_API;
@@ -31,7 +31,7 @@ ReactGA.initialize(GOOGLE_ANALYTICS);
 
 const trackPage = page => {
     ReactGA.set({ page });
-    ReactGA.pageview(page);
+    ReactGA.send(page);
 };
 
 //Update the package.json version everytime whenever new deployment happened to production to clear the browser cache.

src/App.js

@@ -14,7 +14,7 @@ import {LOGIN_INFO, THEME} from "../../constants/localStorage";
 import {stringTruncate} from "../../utils/scripts";
 import {makeHdPath} from "../../utils/helper";
 import TransportWebUSB from "@ledgerhq/hw-transport-webusb";
-import ReactGA from 'react-ga';
+import ReactGA from 'react-ga4';
 import {DefaultChainInfo, ExternalChains} from "../../config";
 import Banner from "../../components/Banner";
 import {keyStoreLogin} from "../../store/actions/signIn/keyStore";

src/containers/Common/DashboardHeader.js

@@ -5,7 +5,7 @@ import helper, {tokenValueConversion} from "../../../utils/helper";
 import {useTranslation} from "react-i18next";
 import {decimalize, formatNumber} from "../../../utils/scripts";
 import NumberView from "../../../components/NumberView";
-import ReactGA from "react-ga";
+import ReactGA from "react-ga4";
 import {DefaultChainInfo, PstakeInfo} from "../../../config";
 const tmRPC = require("@cosmjs/tendermint-rpc");
 const {QueryClient, setupIbcExtension} = require("@cosmjs/stargate");

src/containers/Common/ModalVIewAmountDetails/index.js

@@ -5,7 +5,7 @@ import {useTranslation} from "react-i18next";
 import helper, {tokenValueConversion} from "../../../utils/helper";
 import {formatNumber, stringToNumber, stringTruncate} from "../../../utils/scripts";
 import NumberView from "../../../components/NumberView";
-import ReactGA from "react-ga";
+import ReactGA from "react-ga4";
 import {DefaultChainInfo} from "../../../config";
 
 const ModalViewDelegationDetails = (props) => {

src/containers/Common/ModalViewDelegationDetails/index.js

@@ -5,7 +5,7 @@ import {useTranslation} from "react-i18next";
 import NumberView from "../../../components/NumberView";
 import {formatNumber, localTime, stringToNumber} from "../../../utils/scripts";
 import {tokenValueConversion} from "../../../utils/helper";
-import ReactGA from "react-ga";
+import ReactGA from "react-ga4";
 import {DefaultChainInfo} from "../../../config";
 
 const ModalViewUnbondDetails = (props) => {

src/containers/Common/ModalViewUnbondDetails/index.js

@@ -16,7 +16,7 @@ import {fetchValidators} from "../../store/actions/validators";
 import NumberView from "../../components/NumberView";
 import {formatNumber, stringTruncate} from "../../utils/scripts";
 import {showTxWithDrawTotalModal} from "../../store/actions/transactions/withdrawTotalRewards";
-import ReactGA from "react-ga";
+import ReactGA from "react-ga4";
 import {DefaultChainInfo} from "../../config";
 import {LOGIN_INFO} from "../../constants/localStorage";
 import {keyStoreLogin} from "../../store/actions/signIn/keyStore";

src/containers/Common/TokenInfo.js

@@ -10,7 +10,7 @@ import RefreshIcon from '@material-ui/icons/Refresh';
 import {fetchReceiveTransactions, fetchTransactions} from "../store/actions/transactionHistory";
 import {LOGIN_INFO} from "../constants/localStorage";
 import {updateFee} from "../utils/helper";
-import ReactGA from "react-ga";
+import ReactGA from "react-ga4";
 
 const InfoRefresh = (props) => {
     const [inProgress, setInProgress] = useState(false);