retire analytics events

dapp/pages/compensation.js

@@ -66,8 +66,8 @@ function Compensation({ locale, onLocale, showLogin, rpcProvider }) {
 
   return (
     <>
-      <Layout locale={locale} onLocale={onLocale} dapp medium>
-        <Nav dapp page={'compensation'} locale={locale} onLocale={onLocale} />
+      <Layout locale={locale} onLocale={onLocale} medium>
+        <Nav page={'compensation'} locale={locale} onLocale={onLocale} />
         <div className="home d-flex flex-column">
           <div className="d-flex align-items-center flex-column flex-md-row">
             <div className="bold-text mr-md-3">

dapp/pages/dashboard.js

@@ -674,8 +674,8 @@ const Dashboard = ({ locale, onLocale }) => {
 
   return (
     <>
-      <Layout locale={locale} onLocale={onLocale} dapp>
-        <Nav dapp locale={locale} onLocale={onLocale} />
+      <Layout locale={locale} onLocale={onLocale}>
+        <Nav locale={locale} onLocale={onLocale} />
         <div className="my-5">
           {!account && <h1 className="text-white">No account :(</h1>}
           {account && (

dapp/pages/earn.js

@@ -7,8 +7,8 @@ import CurveStake from 'components/earn/CurveStake'
 
 const Stake = ({ locale, onLocale }) => {
   return (
-    <Layout onLocale={onLocale} locale={locale} dapp shorter isStakePage>
-      <Nav dapp page={'earn'} locale={locale} onLocale={onLocale} />
+    <Layout onLocale={onLocale} locale={locale} shorter isStakePage>
+      <Nav page={'earn'} locale={locale} onLocale={onLocale} />
       {process.env.NEXT_PUBLIC_ENABLE_CURVE_STAKING === 'true' && (
         <CurveStake />
       )}
@@ -31,8 +31,8 @@ export default Stake
 //   return (
 //     process.env.NEXT_PUBLIC_ENABLE_LIQUIDITY_MINING === 'true' && (
 //       <>
-//         <Layout onLocale={onLocale} locale={locale} dapp>
-//           <Nav dapp page={'earn'} locale={locale} onLocale={onLocale} />
+//         <Layout onLocale={onLocale} locale={locale}>
+//           <Nav page={'earn'} locale={locale} onLocale={onLocale} />
 //           <div className="home d-flex flex-column">
 //             <PoolsList
 //               title={fbt('Featured Pools', 'Featured Pools')}

dapp/pages/history.js

@@ -39,8 +39,8 @@ export default function History({ locale, onLocale }) {
           }}
         />
       )}
-      <Layout locale={locale} onLocale={onLocale} dapp>
-        <Nav dapp page={'history'} locale={locale} onLocale={onLocale} />
+      <Layout locale={locale} onLocale={onLocale}>
+        <Nav page={'history'} locale={locale} onLocale={onLocale} />
         <div className="home d-flex flex-column">
           <BalanceHeader />
           {(overrideAccount || active) && <TransactionHistory />}

dapp/pages/index.js

@@ -9,8 +9,8 @@ import PrimarySidePanel from 'components/sidePanel/PrimarySidePanel'
 export default function DApp({ locale, onLocale }) {
   return (
     <>
-      <Layout locale={locale} onLocale={onLocale} dapp>
-        <Nav dapp page={'swap'} locale={locale} onLocale={onLocale} />
+      <Layout locale={locale} onLocale={onLocale}>
+        <Nav page={'swap'} locale={locale} onLocale={onLocale} />
         <div className="home d-flex flex-column">
           <BalanceHeader />
           <div className="d-flex">

dapp/pages/pool/[pool_name]/index.js

@@ -5,25 +5,19 @@ import PoolDetails from 'components/earn/PoolDetails'
 import { useRouter } from 'next/router'
 import { fbt } from 'fbt-runtime'
 import { useStoreState } from 'pullstate'
-
-import ContractStore from 'stores/ContractStore'
 import PoolStore from 'stores/PoolStore'
 
 export default function PoolDetailsPage({ locale, onLocale }) {
   const router = useRouter()
   const { pool_name } = router.query
-  const { uniV2OusdUsdt, liquidityOusdUsdt } = useStoreState(
-    ContractStore,
-    (s) => s.contracts || {}
-  )
   const pools = useStoreState(PoolStore, (s) => s.pools)
   const pool = pools.filter((pool) => pool.name === pool_name)[0]
 
   return (
     process.env.NEXT_PUBLIC_ENABLE_LIQUIDITY_MINING === 'true' && (
       <>
-        <Layout onLocale={onLocale} locale={locale} dapp short>
-          <Nav dapp page={'pool-details'} locale={locale} onLocale={onLocale} />
+        <Layout onLocale={onLocale} locale={locale} short>
+          <Nav page={'pool-details'} locale={locale} onLocale={onLocale} />
           <div className="home d-flex flex-column">
             {pools.length > 0 && <PoolDetails pool={pool} />}
             {pools.length === 0 && <h1>{fbt('Loading...', 'Loading...')}</h1>}

dapp/pages/signTransfer.js

@@ -7,8 +7,8 @@ import SignTransferAuth from 'components/SignTransferAuth'
 export default function DApp({ locale, onLocale }) {
   return (
     <>
-      <Layout locale={locale} onLocale={onLocale} dapp>
-        <Nav dapp page={'swap'} locale={locale} onLocale={onLocale} />
+      <Layout locale={locale} onLocale={onLocale}>
+        <Nav page={'swap'} locale={locale} onLocale={onLocale} />
         <div className="home d-flex flex-column">
           <div className="d-flex">
             <SignTransferAuth />

dapp/pages/wrap.js

@@ -9,8 +9,8 @@ import WrapHomepage from 'components/wrap/WrapHomepage'
 export default function Wrap({ locale, onLocale }) {
   return (
     <>
-      <Layout locale={locale} onLocale={onLocale} dapp>
-        <Nav dapp page={'wrap'} locale={locale} onLocale={onLocale} />
+      <Layout locale={locale} onLocale={onLocale}>
+        <Nav page={'wrap'} locale={locale} onLocale={onLocale} />
         <div className="home d-flex flex-column">
           <BalanceHeaderWrapped />
           <div className="d-flex">

dapp/src/components/AccountStatusDropdown.js

@@ -1,17 +1,13 @@
 import React, { useState } from 'react'
 import { useWeb3React } from '@web3-react/core'
-
 import Dropdown from 'components/Dropdown'
 import GetOUSD from 'components/GetOUSD'
 import { isCorrectNetwork, switchEthereumChain } from 'utils/web3'
-
 import withWalletSelectModal from 'hoc/withWalletSelectModal'
-import analytics from 'utils/analytics'
-
 import Content from './_AccountStatusContent'
 import AccountStatusIndicator from './_AccountStatusIndicator'
 
-const AccountStatusDropdown = ({ className, showLogin, dapp }) => {
+const AccountStatusDropdown = ({ className, showLogin }) => {
   const { active, account, chainId } = useWeb3React()
   const [open, setOpen] = useState(false)
   const correctNetwork = isCorrectNetwork(chainId)
@@ -30,25 +26,21 @@ const AccountStatusDropdown = ({ className, showLogin, dapp }) => {
           }`}
           onClick={async (e) => {
             e.preventDefault()
-            if (dapp && !active) {
+            if (!active) {
               showLogin()
             } else if (active && !correctNetwork) {
-              analytics.track('On Change network', {
-                category: 'settings',
-              })
               // open the dropdown to allow disconnecting, while also requesting an auto switch to mainnet
               await switchEthereumChain()
               setOpen(true)
-            } else if (dapp) {
+            } else {
               setOpen(true)
             }
           }}
         >
           {/* The button id is used by StakeBoxBig to trigger connect when no wallet connected */}
-          {((!active && !account) || (!dapp && active && correctNetwork)) && (
+          {!active && !account && (
             <GetOUSD
               id="main-dapp-nav-connect-wallet-button"
-              connect={dapp}
               className="btn-nav"
               trackSource="Account dropdown"
             />
@@ -57,7 +49,6 @@ const AccountStatusDropdown = ({ className, showLogin, dapp }) => {
             active={active}
             correctNetwork={correctNetwork}
             account={account}
-            dapp={dapp}
             withAddress
           />
         </a>

dapp/src/components/AccountStatusPopover.js

@@ -7,7 +7,7 @@ import Content from './_AccountStatusContent'
 import { assetRootPath } from 'utils/image'
 import AccountStatusIndicator from './_AccountStatusIndicator'
 
-const AccountStatusPopover = ({ className, dapp }) => {
+const AccountStatusPopover = ({ className }) => {
   const { active, account, chainId } = useWeb3React()
   const correctNetwork = isCorrectNetwork(chainId)
 
@@ -31,7 +31,6 @@ const AccountStatusPopover = ({ className, dapp }) => {
             active={active}
             correctNetwork={correctNetwork}
             account={account}
-            dapp={dapp}
           />
         </div>
       </button>

dapp/src/components/AppFooter.js

@@ -10,7 +10,7 @@ const termsURL = process.env.NEXT_PUBLIC_TERMS_URL
 const privacyURL = process.env.NEXT_PUBLIC_PRIVACY_URL
 const discordURL = process.env.NEXT_PUBLIC_DISCORD_URL
 
-export default function Footer({ onLocale, locale, dapp }) {
+export default function Footer({ onLocale, locale }) {
   return (
     <>
       <footer>
@@ -73,7 +73,7 @@ export default function Footer({ onLocale, locale, dapp }) {
                 footer
                 locale={locale}
                 onLocale={onLocale}
-                outerClassName={`${dapp ? 'ml-2' : ''}`}
+                outerClassName={'ml-2'}
                 className="nav-dropdown"
                 useNativeSelectbox={false}
               />

dapp/src/components/GetOUSD.js

@@ -7,7 +7,6 @@ import { useRouter } from 'next/router'
 import withWalletSelectModal from 'hoc/withWalletSelectModal'
 import analytics from 'utils/analytics'
 import { walletLogin } from 'utils/account'
-import { adjustLinkHref } from 'utils/utils'
 
 const GetOUSD = ({
   id,
@@ -21,7 +20,6 @@ const GetOUSD = ({
   light2,
   zIndex2,
   navMarble,
-  connect,
 }) => {
   const { activate, active } = useWeb3React()
   const [userAlreadyConnectedWallet, setUserAlreadyConnectedWallet] =
@@ -59,24 +57,15 @@ const GetOUSD = ({
         style={style}
         onClick={() => {
           if (process.browser) {
-            if (connect) {
-              analytics.track('On Connect', {
-                category: 'general',
-                label: trackSource,
-              })
-              walletLogin(showLogin, activate)
-            } else {
-              analytics.track('On Get OUSD', {
-                category: 'navigation',
-                label: trackSource,
-              })
-              router.push(adjustLinkHref('/swap'))
-            }
+            analytics.track('On Connect', {
+              category: 'general',
+              label: trackSource,
+            })
+            walletLogin(showLogin, activate)
           }
         }}
       >
-        {!connect && fbt('Get OUSD', 'Get OUSD button')}
-        {connect && fbt('Connect', 'Connect button')}
+        {fbt('Connect', 'Connect button')}
       </button>
       <style jsx>{`
         .btn {

dapp/src/components/IPFSDappLink.js

@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react'
 import { fbt } from 'fbt-runtime'
 import { assetRootPath } from 'utils/image'
 
-export default function IPFSDappLink({ dapp, css }) {
+export default function IPFSDappLink({ css }) {
   const [displayIpfsLink, setDisplayIpfsLink] = useState(false)
 
   useEffect(() => {
@@ -14,7 +14,7 @@ export default function IPFSDappLink({ dapp, css }) {
   }, [])
 
   return (
-    <div className={`${!displayIpfsLink || !dapp ? 'd-none' : css}`}>
+    <div className={`${!displayIpfsLink || css}`}>
       <a
         className={`ipfs-link d-flex justify-content-center align-items-center`}
         href={process.env.NEXT_PUBLIC_IPFS_DAPP_URL}