From d63f05918ab8a969ffdbe71c3d96a03f9abd453d Mon Sep 17 00:00:00 2001
From: rolandpo <rolopod@gmail.com>
Date: Mon, 27 Mar 2023 14:35:22 +0200
Subject: [PATCH 1/2] retire analytics events

---
 dapp/pages/compensation.js                    |   4 +-
 dapp/pages/dashboard.js                       |   4 +-
 dapp/pages/earn.js                            |   8 +-
 dapp/pages/history.js                         |   4 +-
 dapp/pages/index.js                           |   4 +-
 dapp/pages/pool/[pool_name]/index.js          |  10 +-
 dapp/pages/signTransfer.js                    |   4 +-
 dapp/pages/wrap.js                            |   4 +-
 dapp/src/components/AccountStatusDropdown.js  |  17 +-
 dapp/src/components/AccountStatusPopover.js   |   3 +-
 dapp/src/components/AppFooter.js              |   4 +-
 dapp/src/components/GetOUSD.js                |  23 +-
 dapp/src/components/IPFSDappLink.js           |   4 +-
 dapp/src/components/MarketingFooter.js        | 168 ------------
 dapp/src/components/Nav.js                    | 258 +++++-------------
 dapp/src/components/_AccountStatusContent.js  |   5 -
 .../src/components/_AccountStatusIndicator.js |   5 +-
 dapp/src/components/buySell/ApproveSwap.js    |  21 +-
 dapp/src/components/buySell/ContractsTable.js |  15 -
 .../components/buySell/SettingsDropdown.js    |  15 -
 dapp/src/components/buySell/SwapHomepage.js   |  14 +-
 dapp/src/components/earn/CurveStake.js        |  10 -
 dapp/src/components/earn/modal/StakeModal.js  |  12 -
 dapp/src/components/layout.js                 |  31 +--
 dapp/src/components/wrap/WrapHomepage.js      |  13 +-
 dapp/src/utils/setLocale.js                   |   9 +-
 26 files changed, 113 insertions(+), 556 deletions(-)
 delete mode 100644 dapp/src/components/MarketingFooter.js

diff --git a/dapp/pages/compensation.js b/dapp/pages/compensation.js
index f388cb19b4..00da748b44 100644
--- a/dapp/pages/compensation.js
+++ b/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">
diff --git a/dapp/pages/dashboard.js b/dapp/pages/dashboard.js
index 2a71c3f8c6..a3ee876605 100644
--- a/dapp/pages/dashboard.js
+++ b/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 && (
diff --git a/dapp/pages/earn.js b/dapp/pages/earn.js
index 62fe313f53..556b84ebc3 100644
--- a/dapp/pages/earn.js
+++ b/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')}
diff --git a/dapp/pages/history.js b/dapp/pages/history.js
index e88f85b9e7..0f1df9100b 100644
--- a/dapp/pages/history.js
+++ b/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 />}
diff --git a/dapp/pages/index.js b/dapp/pages/index.js
index 23437d7556..40ef8eb636 100644
--- a/dapp/pages/index.js
+++ b/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">
diff --git a/dapp/pages/pool/[pool_name]/index.js b/dapp/pages/pool/[pool_name]/index.js
index b1c1c7158a..69eed38e5b 100644
--- a/dapp/pages/pool/[pool_name]/index.js
+++ b/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>}
diff --git a/dapp/pages/signTransfer.js b/dapp/pages/signTransfer.js
index 68f711dfeb..628ccee057 100644
--- a/dapp/pages/signTransfer.js
+++ b/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 />
diff --git a/dapp/pages/wrap.js b/dapp/pages/wrap.js
index 58861a1251..0cc12d7a60 100644
--- a/dapp/pages/wrap.js
+++ b/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">
diff --git a/dapp/src/components/AccountStatusDropdown.js b/dapp/src/components/AccountStatusDropdown.js
index 53bd561c5d..f3ccf491cf 100644
--- a/dapp/src/components/AccountStatusDropdown.js
+++ b/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>
diff --git a/dapp/src/components/AccountStatusPopover.js b/dapp/src/components/AccountStatusPopover.js
index 45af61a94b..22e571394e 100644
--- a/dapp/src/components/AccountStatusPopover.js
+++ b/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>
diff --git a/dapp/src/components/AppFooter.js b/dapp/src/components/AppFooter.js
index 1faa7ef283..8360119bb9 100644
--- a/dapp/src/components/AppFooter.js
+++ b/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}
               />
diff --git a/dapp/src/components/GetOUSD.js b/dapp/src/components/GetOUSD.js
index 9307398b68..4160b560a2 100644
--- a/dapp/src/components/GetOUSD.js
+++ b/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 {
diff --git a/dapp/src/components/IPFSDappLink.js b/dapp/src/components/IPFSDappLink.js
index 7beed00643..c2f7642cce 100644
--- a/dapp/src/components/IPFSDappLink.js
+++ b/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}
diff --git a/dapp/src/components/MarketingFooter.js b/dapp/src/components/MarketingFooter.js
deleted file mode 100644
index 12750f7912..0000000000
--- a/dapp/src/components/MarketingFooter.js
+++ /dev/null
@@ -1,168 +0,0 @@
-import { fbt } from 'fbt-runtime'
-import analytics from 'utils/analytics'
-import { getDocsLink } from 'utils/getDocsLink'
-import { assetRootPath } from 'utils/image'
-import { useRouter } from 'next/router'
-
-import EmailForm from './EmailForm'
-
-const analyticsURL = process.env.NEXT_PUBLIC_ANALYTICS_URL
-const jobsURL = process.env.NEXT_PUBLIC_JOBS_URL
-const termsURL = process.env.NEXT_PUBLIC_TERMS_URL
-const privacyURL = process.env.NEXT_PUBLIC_PRIVACY_URL
-const discordURL = process.env.NEXT_PUBLIC_DISCORD_URL
-const telegramURL = process.env.NEXT_PUBLIC_TELEGRAM_URL
-const wechatURL = process.env.NEXT_PUBLIC_WECHAT_URL
-const githubURL = process.env.NEXT_PUBLIC_GITHUB_URL
-const redditURL = process.env.NEXT_PUBLIC_REDDIT_URL
-const weiboURL = process.env.NEXT_PUBLIC_WEIBO_URL
-const facebookURL = process.env.NEXT_PUBLIC_FACEBOOK_URL
-const twitterURL = process.env.NEXT_PUBLIC_TWITTER_URL
-const mediumURL = process.env.NEXT_PUBLIC_MEDIUM_URL
-const youtubeURL = process.env.NEXT_PUBLIC_YOUTUBE_URL
-const instagramURL = process.env.NEXT_PUBLIC_INSTAGRAM_URL
-
-export default function Footer({ locale }) {
-  const { pathname } = useRouter()
-
-  return (
-    <>
-      <footer className={`${pathname === '/burn' ? 'burn' : ''}`}>
-        <div className="container">
-          <div className="d-flex align-items-center justify-content-center">
-            <div className="">
-              <nav className="nav d-flex justify-content-center">
-                <a
-                  href={analyticsURL}
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  className="nav-link"
-                >
-                  {fbt('Analytics', 'Analytics link')}
-                </a>
-                <a
-                  href={jobsURL}
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  className="nav-link"
-                >
-                  {fbt('Jobs', 'Jobs link')}
-                </a>
-                <a
-                  href={getDocsLink(locale)}
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  className="nav-link"
-                ></a>
-                <a
-                  href={discordURL}
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  className="nav-link"
-                >
-                  {fbt('Discord', 'Discord link')}
-                </a>
-                <a
-                  href={githubURL}
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  className="nav-link"
-                >
-                  {fbt('Github', 'Github link')}
-                </a>
-              </nav>
-              <div className="legal d-flex flex-column align-items-center">
-                <a
-                  href="https://originprotocol.com"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  {fbt(
-                    'Originally released by Origin Protocol',
-                    'Originally released by Origin Protocol'
-                  )}
-                </a>
-                <nav className="nav d-flex">
-                  <a
-                    href={termsURL}
-                    target="_blank"
-                    rel="noopener noreferrer"
-                    className="nav-link"
-                  >
-                    {fbt('Terms of Service', 'Terms of Service')}
-                  </a>
-                  <a
-                    href={privacyURL}
-                    target="_blank"
-                    rel="noopener noreferrer"
-                    className="nav-link"
-                  >
-                    {fbt('Privacy Policy', 'Privacy Policy')}
-                  </a>
-                </nav>
-              </div>
-            </div>
-          </div>
-        </div>
-      </footer>
-      <style jsx>{`
-        footer {
-          background-color: #061d2a;
-          padding: 100px 0 160px 0;
-        }
-        footer.burn {
-          background-color: #141519;
-        }
-        h5 {
-          color: white;
-          font-size: 1.125rem;
-          font-weight: bold;
-        }
-        p {
-          color: #bdcbd5;
-          font-size: 1.125rem;
-        }
-        a,
-        .legal {
-          color: white;
-          font-size: 0.875rem;
-        }
-        .nav,
-        .legal {
-          margin-top: 20px;
-        }
-        a:hover {
-          cursor: pointer;
-          opacity: 0.8;
-        }
-        .nav-link {
-          padding: 0;
-        }
-        .nav-link:not(:last-of-type) {
-          padding-right: 32px;
-        }
-        .legal,
-        .legal .nav-link {
-          color: #bdcbd5;
-          line-height: 2;
-        }
-        @media (max-width: 799px) {
-          .container {
-            padding-left: 30px;
-            padding-right: 30px;
-          }
-          .col-12 {
-            padding-right: 0px;
-            padding-left: 0px;
-          }
-          footer {
-            padding: 50px 10px;
-          }
-          .nav-link {
-            min-width: 110px;
-            margin-bottom: 20px;
-          }
-      `}</style>
-    </>
-  )
-}
diff --git a/dapp/src/components/Nav.js b/dapp/src/components/Nav.js
index 7a042c8d22..43b5dea810 100644
--- a/dapp/src/components/Nav.js
+++ b/dapp/src/components/Nav.js
@@ -5,111 +5,72 @@ import { useRouter } from 'next/router'
 import { fbt } from 'fbt-runtime'
 import { useStoreState } from 'pullstate'
 import { useWeb3React } from '@web3-react/core'
-
 import withIsMobile from 'hoc/withIsMobile'
-
 import GetOUSD from 'components/GetOUSD'
 import AccountStatusDropdown from 'components/AccountStatusDropdown'
-import { formatCurrency } from 'utils/math'
-import { getDocsLink } from 'utils/getDocsLink'
 import LanguageOptions from 'components/LanguageOptions'
-import LanguageSelected from 'components/LanguageSelected'
-import LocaleDropdown from 'components/LocaleDropdown'
-import OusdDropdown from 'components/earn/OusdDropdown'
-import OgnDropdown from 'components/earn/OgnDropdown'
 import IPFSDappLink from 'components/IPFSDappLink'
 import ContractStore from 'stores/ContractStore'
-import AccountStore from 'stores/AccountStore'
-
-import Languages from '../constants/Languages'
 import AccountStatusPopover from './AccountStatusPopover'
 import { adjustLinkHref } from 'utils/utils'
 import { assetRootPath } from 'utils/image'
 
 const environment = process.env.NODE_ENV
-const showExperimentalSoftwareNotice = false
-const DappLinks = ({ dapp, page }) => {
-  const ousdBalance = useStoreState(AccountStore, (s) => s.balances['ousd'])
-  const lifetimeYield = useStoreState(AccountStore, (s) => s.lifetimeYield)
 
+const DappLinks = ({ page }) => {
   return (
     <>
-      {!dapp && (
-        <a
-          href={adjustLinkHref('https://analytics.ousd.com/apy')}
-          rel="noopener noreferrer"
-          target="blank"
-        >
-          <div
-            className={classnames(
-              'banner align-items-center justify-content-center',
-              { dapp }
-            )}
+      <div className="d-flex align-items-center justify-content-center dapp-navigation mr-auto flex-wrap">
+        <Link href={adjustLinkHref('/')}>
+          <a
+            className={`d-flex align-items-center ml-md-0 ${
+              page === 'swap' ? 'selected' : ''
+            }`}
           >
-            <div className="triangle d-none d-xl-block"></div>
-            {fbt(
-              `Trailing 30-day APY: ${fbt.param(
-                'APY',
-                formatCurrency(apy * 100, 2) + '%'
-              )}`,
-              'Current APY banner'
-            )}
-          </div>
-        </a>
-      )}
-      {dapp && (
-        <div className="d-flex align-items-center justify-content-center dapp-navigation mr-auto flex-wrap">
-          <Link href={adjustLinkHref('/')}>
-            <a
-              className={`d-flex align-items-center ml-md-0 ${
-                page === 'swap' ? 'selected' : ''
-              }`}
-            >
-              {fbt('Swap OUSD', 'Swap OUSD')}
-            </a>
-          </Link>
-          {process.env.NEXT_PUBLIC_ENABLE_LIQUIDITY_MINING === 'true' && (
-            <Link href={adjustLinkHref('/earn')}>
-              <a
-                className={`d-flex align-items-center ${
-                  page === 'earn' || page === 'pool-details' ? 'selected' : ''
-                }`}
-              >
-                {fbt('Earn OGN', 'Earn OGN')}
-              </a>
-            </Link>
-          )}
-          {process.env.NEXT_PUBLIC_ENABLE_STAKING === 'true' && (
-            <Link href={adjustLinkHref('/earn')}>
-              <a
-                className={`d-flex align-items-center ${
-                  page === 'earn' ? 'selected' : ''
-                }`}
-              >
-                {fbt('Earn OGN', 'Earn OGN')}
-              </a>
-            </Link>
-          )}
-          <Link href={adjustLinkHref('/wrap')}>
+            {fbt('Swap OUSD', 'Swap OUSD')}
+          </a>
+        </Link>
+        {process.env.NEXT_PUBLIC_ENABLE_LIQUIDITY_MINING === 'true' && (
+          <Link href={adjustLinkHref('/earn')}>
             <a
               className={`d-flex align-items-center ${
-                page === 'wrap' ? 'selected' : ''
+                page === 'earn' || page === 'pool-details' ? 'selected' : ''
               }`}
             >
-              {fbt('Wrap OUSD', 'Wrap OUSD')}
+              {fbt('Earn OGN', 'Earn OGN')}
             </a>
           </Link>
-          <Link href={adjustLinkHref('/history')}>
+        )}
+        {process.env.NEXT_PUBLIC_ENABLE_STAKING === 'true' && (
+          <Link href={adjustLinkHref('/earn')}>
             <a
               className={`d-flex align-items-center ${
-                page === 'history' ? 'selected' : ''
+                page === 'earn' ? 'selected' : ''
               }`}
             >
-              {fbt('History', 'History')}
+              {fbt('Earn OGN', 'Earn OGN')}
             </a>
           </Link>
-        </div>
-      )}
+        )}
+        <Link href={adjustLinkHref('/wrap')}>
+          <a
+            className={`d-flex align-items-center ${
+              page === 'wrap' ? 'selected' : ''
+            }`}
+          >
+            {fbt('Wrap OUSD', 'Wrap OUSD')}
+          </a>
+        </Link>
+        <Link href={adjustLinkHref('/history')}>
+          <a
+            className={`d-flex align-items-center ${
+              page === 'history' ? 'selected' : ''
+            }`}
+          >
+            {fbt('History', 'History')}
+          </a>
+        </Link>
+      </div>
       <style jsx>{`
         .dapp-navigation {
           font-family: Lato;
@@ -156,7 +117,7 @@ const DappLinks = ({ dapp, page }) => {
   )
 }
 
-const Nav = ({ dapp, isMobile, locale, onLocale, page }) => {
+const Nav = ({ isMobile, locale, onLocale, page }) => {
   const { pathname } = useRouter()
   const { active, account } = useWeb3React()
   const apy = useStoreState(ContractStore, (s) => s.apy.apy30 || 0)
@@ -165,20 +126,15 @@ const Nav = ({ dapp, isMobile, locale, onLocale, page }) => {
     <>
       <nav
         className={classnames(
-          'navbar navbar-expand-lg d-flex justify-content-center flex-column',
-          { dapp }
+          'navbar navbar-expand-lg d-flex justify-content-center flex-column dapp',
         )}
       >
         <div
-          className={`container ${
-            dapp ? '' : 'nav pl-lg-5 pr-lg-5'
-          } flex-nowrap`}
+          className='container flex-nowrap'
         >
           <Link href={adjustLinkHref('/')}>
             <a
-              className={`navbar-brand d-flex flex-column justify-content-center ${
-                dapp ? '' : 'ml-lg-5'
-              }`}
+              className='navbar-brand d-flex flex-column justify-content-center'
             >
               <img
                 src={assetRootPath('/images/origin-dollar-logo.svg')}
@@ -187,43 +143,25 @@ const Nav = ({ dapp, isMobile, locale, onLocale, page }) => {
               />
             </a>
           </Link>
-          {dapp && (
-            <button
-              className="navbar-toggler d-lg-none ml-auto"
-              type="button"
-              data-toggle="collapse"
-              data-target=".primarySidePanel"
-              aria-controls="primarySidePanel"
-              aria-expanded="false"
-              aria-label="Toggle side panel"
-            >
-              <div className="dropdown-marble">
-                <img
-                  src={assetRootPath('/images/bell-icon.svg')}
-                  alt="Activity menu"
-                />
-              </div>
-            </button>
-          )}
-          <IPFSDappLink dapp={dapp} css="d-lg-none" />
-          {!dapp && (
-            <button
-              className="navbar-toggler d-lg-none ml-4"
-              type="button"
-              data-toggle="collapse"
-              data-target=".navLinks"
-              aria-controls="navLinks"
-              aria-expanded="false"
-              aria-label="Toggle menu side panel"
-            >
+          <button
+            className="navbar-toggler d-lg-none ml-auto"
+            type="button"
+            data-toggle="collapse"
+            data-target=".primarySidePanel"
+            aria-controls="primarySidePanel"
+            aria-expanded="false"
+            aria-label="Toggle side panel"
+          >
+            <div className="dropdown-marble">
               <img
-                src={assetRootPath('/images/menu-icon.svg')}
+                src={assetRootPath('/images/bell-icon.svg')}
                 alt="Activity menu"
               />
-            </button>
-          )}
-          {dapp && <AccountStatusPopover dapp={dapp} />}
-          {dapp && !active && !account && (
+            </div>
+          </button>
+          <IPFSDappLink css="d-lg-none" />
+          {<AccountStatusPopover />}
+          {!active && !account && (
             <div className="d-flex d-md-none">
               <GetOUSD
                 navMarble
@@ -270,9 +208,7 @@ const Nav = ({ dapp, isMobile, locale, onLocale, page }) => {
             <LanguageOptions locale={locale} onLocale={onLocale} />
           </div>
           <div
-            className={`navLinks collapse navbar-collapse justify-content-end flex-column flex-lg-row d-flex ${
-              dapp ? '' : 'mr-lg-5'
-            }`}
+            className={'navLinks collapse navbar-collapse justify-content-end flex-column flex-lg-row d-flex'}
           >
             <button
               className="close navbar-toggler"
@@ -290,56 +226,8 @@ const Nav = ({ dapp, isMobile, locale, onLocale, page }) => {
               />
             </button>
             <div className="d-flex flex-column flex-lg-row mb-auto w-100 align-items-center">
-              {!dapp && (
-                <ul className={`navbar-nav ${!dapp ? 'ml-auto' : ''}`}>
-                  <li
-                    className={classnames('nav-item', {
-                      active: pathname === '/',
-                    })}
-                  >
-                    <Link href={adjustLinkHref('/')}>
-                      <a className="nav-link">
-                        {fbt('Home', 'Home page link')}{' '}
-                        <span className="sr-only">(current)</span>
-                      </a>
-                    </Link>
-                  </li>
-                  <li
-                    className={classnames('nav-item', {
-                      active: pathname === '/earn-info',
-                    })}
-                  >
-                    <Link href={adjustLinkHref('/earn-info')}>
-                      <a className="nav-link">
-                        {fbt('Earn', 'Earn info page link')}
-                      </a>
-                    </Link>
-                  </li>
-                  <li
-                    className={classnames('nav-item', {
-                      active: pathname === '/governance',
-                    })}
-                  >
-                    <Link href={adjustLinkHref('/governance')}>
-                      <a className="nav-link">
-                        {fbt('Governance', 'Governance page link')}
-                      </a>
-                    </Link>
-                  </li>
-                  <li className="nav-item">
-                    <a
-                      href={getDocsLink(locale)}
-                      target="_blank"
-                      rel="noopener noreferrer"
-                      className="nav-link"
-                    >
-                      {fbt('Docs', 'Documentation link')}
-                    </a>
-                  </li>
-                </ul>
-              )}
-              <DappLinks dapp={dapp} page={page} />
-              {dapp && environment !== 'production' && (
+              <DappLinks page={page} />
+              {environment !== 'production' && (
                 <ul className="navbar-nav">
                   <li className="nav-item mr-2">
                     <Link href={adjustLinkHref('/dashboard')}>
@@ -348,25 +236,11 @@ const Nav = ({ dapp, isMobile, locale, onLocale, page }) => {
                   </li>
                 </ul>
               )}
-              <IPFSDappLink dapp={dapp} css="d-none d-lg-block" />
+              <IPFSDappLink css="d-none d-lg-block" />
               <div
-                className={`d-flex flex-column ${
-                  dapp ? 'flex-lg-row-reverse' : 'flex-lg-row'
-                }`}
+                className={`d-flex flex-column flex-lg-row-reverse`}
               >
-                {!dapp && (
-                  <LocaleDropdown
-                    locale={locale}
-                    onLocale={onLocale}
-                    outerClassName={`${dapp ? 'ml-2' : ''}`}
-                    className="nav-dropdown"
-                    useNativeSelectbox={false}
-                  />
-                )}
-                <AccountStatusDropdown
-                  dapp={dapp}
-                  className={dapp ? '' : 'ml-2'}
-                />
+                <AccountStatusDropdown />
               </div>
               <GetOUSD
                 style={{ marginTop: 40 }}
@@ -378,7 +252,7 @@ const Nav = ({ dapp, isMobile, locale, onLocale, page }) => {
           </div>
         </div>
         <div className="d-flex d-lg-none">
-          <DappLinks dapp={dapp} page={page} />
+          <DappLinks page={page} />
         </div>
       </nav>
       <style jsx>{`
diff --git a/dapp/src/components/_AccountStatusContent.js b/dapp/src/components/_AccountStatusContent.js
index b5bd1468bc..b0d4a04ea9 100644
--- a/dapp/src/components/_AccountStatusContent.js
+++ b/dapp/src/components/_AccountStatusContent.js
@@ -12,7 +12,6 @@ import { useOverrideAccount } from 'utils/hooks'
 import { currencies } from 'constants/Contract'
 import { formatCurrency } from 'utils/math'
 import { connectorNameIconMap, getConnectorIcon } from 'utils/connectors'
-import analytics from 'utils/analytics'
 import { assetRootPath } from 'utils/image'
 
 const AccountStatusContent = ({ className, onOpen }) => {
@@ -107,10 +106,6 @@ const AccountStatusContent = ({ className, onOpen }) => {
               className="btn-clear-blue w-100"
               onClick={(e) => {
                 e.preventDefault()
-                analytics.track('On Disconnect Wallet', {
-                  category: 'general',
-                  label: connectorName,
-                })
                 if (onOpen) {
                   onOpen(false)
                 }
diff --git a/dapp/src/components/_AccountStatusIndicator.js b/dapp/src/components/_AccountStatusIndicator.js
index 3d18e8f54e..a796ab46e2 100644
--- a/dapp/src/components/_AccountStatusIndicator.js
+++ b/dapp/src/components/_AccountStatusIndicator.js
@@ -8,7 +8,6 @@ const AccountStatusIndicator = ({
   active,
   account,
   correctNetwork,
-  dapp,
   withAddress,
 }) => {
   const { overrideAccount } = useOverrideAccount()
@@ -16,7 +15,7 @@ const AccountStatusIndicator = ({
   return (
     <>
       {/* What causes !active && account? */}
-      {dapp && !active && account && <div className="dot" />}
+      {!active && account && <div className="dot" />}
       {active && overrideAccount && (
         <>
           <div className="dot white" />
@@ -40,7 +39,7 @@ const AccountStatusIndicator = ({
           )}
         </>
       )}
-      {dapp && active && correctNetwork && !overrideAccount && (
+      {active && correctNetwork && !overrideAccount && (
         <>
           <div className="dot green" />
           {withAddress && (
diff --git a/dapp/src/components/buySell/ApproveSwap.js b/dapp/src/components/buySell/ApproveSwap.js
index 1e4a17faa7..ce5b7c24e9 100644
--- a/dapp/src/components/buySell/ApproveSwap.js
+++ b/dapp/src/components/buySell/ApproveSwap.js
@@ -3,7 +3,6 @@ import { fbt } from 'fbt-runtime'
 import { useStoreState } from 'pullstate'
 import { useWeb3React } from '@web3-react/core'
 import ContractStore from 'stores/ContractStore'
-import analytics from 'utils/analytics'
 import withRpcProvider from 'hoc/withRpcProvider'
 import { ethers } from 'ethers'
 import withIsMobile from 'hoc/withIsMobile'
@@ -223,11 +222,6 @@ const ApproveSwap = ({
 
   const startApprovalProcess = async () => {
     if (stage === 'approve' && contract) {
-      analytics.track('On Approve Coin', {
-        category: isWrapped ? 'wrap' : 'swap',
-        label: swapMetadata.coinGiven,
-        value: parseInt(swapMetadata.swapAmount),
-      })
       setStage('waiting-user')
       try {
         const result = await contract
@@ -246,12 +240,7 @@ const ApproveSwap = ({
           contract: needsApproval,
           coin: stableCoinToApprove,
         })
-        const receipt = await rpcProvider.waitForTransaction(result.hash)
-        analytics.track('Approval Successful', {
-          category: 'swap',
-          label: swapMetadata.coinGiven,
-          value: parseInt(swapMetadata.swapAmount),
-        })
+        await rpcProvider.waitForTransaction(result.hash)
         setIsApproving({})
         setStage('done')
       } catch (e) {
@@ -260,14 +249,6 @@ const ApproveSwap = ({
         setStage('approve')
         if (e.code !== 4001) {
           await storeTransactionError('approve', stableCoinToApprove)
-          analytics.track(`Approval failed`, {
-            category: isWrapped ? 'wrap' : 'swap',
-            label: e.message,
-          })
-        } else {
-          analytics.track(`Approval canceled`, {
-            category: isWrapped ? 'wrap' : 'swap',
-          })
         }
       }
     }
diff --git a/dapp/src/components/buySell/ContractsTable.js b/dapp/src/components/buySell/ContractsTable.js
index 7b8da68edc..6922f43165 100644
--- a/dapp/src/components/buySell/ContractsTable.js
+++ b/dapp/src/components/buySell/ContractsTable.js
@@ -4,7 +4,6 @@ import { fbt } from 'fbt-runtime'
 import { find, sortBy } from 'lodash'
 import { useStoreState } from 'pullstate'
 import { formatCurrency } from 'utils/math'
-import analytics from 'utils/analytics'
 import { assetRootPath } from 'utils/image'
 
 import ContractStore from 'stores/ContractStore'
@@ -223,19 +222,11 @@ const ContractsTable = () => {
         <ConfirmationModal
           onConfirm={() => {
             setConfirmAlternateRoute(true)
-            analytics.track('On confirm tx route change', {
-              category: 'settings',
-              label: alternateRouteEstimationSelected.name,
-            })
             setShowAlternateRouteModal(false)
             setAlternateRouteEstimationSelected(null)
           }}
           onClose={() => {
             setConfirmAlternateRoute(false)
-            analytics.track('On deny tx route change', {
-              category: 'settings',
-              label: alternateRouteEstimationSelected.name,
-            })
             setShowAlternateRouteModal(false)
             setAlternateRouteEstimationSelected(null)
           }}
@@ -372,12 +363,6 @@ const ContractsTable = () => {
                   return
                 }
 
-                analytics.track('On tx route change', {
-                  category: 'settings',
-                  label: estimation.name,
-                  value: estimation.isBest ? 1 : 0,
-                })
-
                 if (!alternateTxRouteConfirmed) {
                   setShowAlternateRouteModal(estimation.name)
                   setAlternateRouteEstimationSelected(estimation)
diff --git a/dapp/src/components/buySell/SettingsDropdown.js b/dapp/src/components/buySell/SettingsDropdown.js
index 2322cbf161..5fc8b4f46b 100644
--- a/dapp/src/components/buySell/SettingsDropdown.js
+++ b/dapp/src/components/buySell/SettingsDropdown.js
@@ -40,12 +40,6 @@ const SettingsDropdown = ({ setPriceToleranceValue, priceToleranceValue }) => {
                         setShowWarning(value > 1)
                         value = value > 50 ? 50 : value
                         value = truncateDecimals(value, 2)
-                        if (value !== priceToleranceValue) {
-                          analytics.track('On price tolerance change', {
-                            category: 'settings',
-                            label: value,
-                          })
-                        }
                         setPriceToleranceValue(value)
                       }
                     }}
@@ -84,10 +78,6 @@ const SettingsDropdown = ({ setPriceToleranceValue, priceToleranceValue }) => {
                       }
                       value = Math.floor(value)
                       value *= Math.pow(10, 9)
-                      analytics.track('On gas setting change', {
-                        category: 'settings',
-                        label: value,
-                      })
 
                       ContractStore.update((s) => {
                         s.gasPrice = BigNumber.from(value)
@@ -112,11 +102,6 @@ const SettingsDropdown = ({ setPriceToleranceValue, priceToleranceValue }) => {
           onClick={(e) => {
             const newOpenState = !settingsOpen
             setSettingsOpen(newOpenState)
-            if (newOpenState) {
-              analytics.track('On open settings', {
-                category: 'settings',
-              })
-            }
           }}
         />
       </Dropdown>
diff --git a/dapp/src/components/buySell/SwapHomepage.js b/dapp/src/components/buySell/SwapHomepage.js
index 573ae2bc9c..31556c0e82 100644
--- a/dapp/src/components/buySell/SwapHomepage.js
+++ b/dapp/src/components/buySell/SwapHomepage.js
@@ -13,7 +13,6 @@ import PillArrow from 'components/buySell/_PillArrow'
 import SettingsDropdown from 'components/buySell/SettingsDropdown'
 import useSwapEstimator from 'hooks/useSwapEstimator'
 import withIsMobile from 'hoc/withIsMobile'
-import { getUserSource } from 'utils/user'
 import ApproveSwap from 'components/buySell/ApproveSwap'
 import analytics from 'utils/analytics'
 import { formatCurrencyMinMaxDecimals, removeCommas } from '../../utils/math'
@@ -218,12 +217,6 @@ const SwapHomepage = ({
     const metadata = swapMetadata()
 
     try {
-      analytics.track('Before Swap Transaction', {
-        category: 'swap',
-        label: metadata.stablecoinUsed,
-        value: metadata.swapAmount,
-      })
-
       let result, swapAmount, minSwapAmount
       if (selectedSwap.name === 'flipper') {
         ;({ result, swapAmount, minSwapAmount } = await swapFlipper())
@@ -261,12 +254,7 @@ const SwapHomepage = ({
       setSelectedBuyCoinAmount('')
       setSelectedRedeemCoinAmount('')
 
-      const receipt = await rpcProvider.waitForTransaction(result.hash)
-      analytics.track('Swap succeeded User source', {
-        category: 'swap',
-        label: getUserSource(),
-        value: metadata.swapAmount,
-      })
+      await rpcProvider.waitForTransaction(result.hash)
       analytics.track('Swap succeeded', {
         category: 'swap',
         label: metadata.stablecoinUsed,
diff --git a/dapp/src/components/earn/CurveStake.js b/dapp/src/components/earn/CurveStake.js
index 3c3db8c0c8..bc40124561 100644
--- a/dapp/src/components/earn/CurveStake.js
+++ b/dapp/src/components/earn/CurveStake.js
@@ -292,11 +292,6 @@ const CurveStake = ({ rpcProvider, isMobile }) => {
                 target="_blank"
                 rel="noopener noreferrer"
                 className="btn btn-blue mt-md-auto"
-                onClick={() => {
-                  analytics.track('On Add Liquidity', {
-                    category: 'navigation',
-                  })
-                }}
               >
                 {fbt('Add Liquidity', 'Add Liquidity Button')}
               </a>
@@ -316,11 +311,6 @@ const CurveStake = ({ rpcProvider, isMobile }) => {
                 target="_blank"
                 rel="noopener noreferrer"
                 className="btn btn-blue mt-md-auto"
-                onClick={() => {
-                  analytics.track('On Claim Rewards', {
-                    category: 'navigation',
-                  })
-                }}
               >
                 {fbt('Claim Rewards', 'Claim Rewards Button')}
               </a>
diff --git a/dapp/src/components/earn/modal/StakeModal.js b/dapp/src/components/earn/modal/StakeModal.js
index 90d346be7f..75ce629b1c 100644
--- a/dapp/src/components/earn/modal/StakeModal.js
+++ b/dapp/src/components/earn/modal/StakeModal.js
@@ -69,12 +69,6 @@ const StakeModal = ({
                 onUserConfirmedStakeTx(result, {
                   stakeAmount,
                 })
-                analytics.track('Stake', {
-                  amount: tokensToStake,
-                  // we already store utm_source as user property. This is for easier analytics
-                  utm_source: getUserSource(),
-                  token_name: stakeTokenName,
-                })
                 onClose()
               } else {
                 setModalState('approve-tokens')
@@ -114,12 +108,6 @@ const StakeModal = ({
               onUserConfirmedStakeTx(result, {
                 stakeAmount,
               })
-              analytics.track('Stake', {
-                amount: tokensToStake,
-                // we already store utm_source as user property. This is for easier analytics
-                utm_source: getUserSource(),
-                token_name: stakeTokenName,
-              })
               onClose()
             } catch (e) {
               console.log(
diff --git a/dapp/src/components/layout.js b/dapp/src/components/layout.js
index a75d69a9e1..485d7871c2 100644
--- a/dapp/src/components/layout.js
+++ b/dapp/src/components/layout.js
@@ -12,7 +12,6 @@ import ContractStore from 'stores/ContractStore'
 import StakeStore from 'stores/StakeStore'
 import withRpcProvider from 'hoc/withRpcProvider'
 import AppFooter from './AppFooter'
-import MarketingFooter from './MarketingFooter'
 import { adjustLinkHref } from 'utils/utils'
 import { assetRootPath } from 'utils/image'
 import { burnTimer } from 'utils/constants'
@@ -24,7 +23,6 @@ const Layout = ({
   locale,
   onLocale,
   children,
-  dapp,
   short,
   shorter,
   medium,
@@ -61,7 +59,7 @@ const Layout = ({
   const burnPage = pathname === '/burn'
   const stakePage = pathname === '/earn'
   const stakes = useStoreState(StakeStore, (s) => s)
-  const showStakingBanner = dapp && !stakePage && stakes.stakes?.length
+  const showStakingBanner = !stakePage && stakes.stakes?.length
 
   const notice = showStakingBanner || burnTimer().days >= 0
 
@@ -101,10 +99,7 @@ const Layout = ({
       </Head>
       <div
         className={classnames(
-          'notice text-white text-center p-3',
-          {
-            dapp,
-          },
+          'notice text-white text-center p-3 dapp',
           rebaseOptedOut ? '' : 'd-none'
         )}
       >
@@ -129,10 +124,7 @@ const Layout = ({
       </div>
       <div
         className={classnames(
-          'notice text-white text-center p-3',
-          {
-            dapp,
-          },
+          'notice text-white text-center p-3 dapp',
           showUniswapNotice ? '' : 'd-none'
         )}
       >
@@ -160,16 +152,11 @@ const Layout = ({
           className={classnames(
             `notice ${showStakingBanner ? 'staking pt-2' : 'pt-3'} ${
               burnPage ? 'burn' : ''
-            } ${dapp ? '' : 'px-lg-5'} text-white text-center pb-3`,
-            {
-              dapp,
-            }
+            } text-white text-center pb-3 dapp`,
           )}
         >
           <div
-            className={`container d-flex flex-column flex-md-row align-items-center ${
-              dapp ? '' : 'nav px-lg-5'
-            }`}
+            className='container d-flex flex-column flex-md-row align-items-center'
           >
             {showStakingBanner ? (
               <>
@@ -221,12 +208,10 @@ const Layout = ({
           </div>
         </div>
       )}
-      <main className={classnames({ dapp, short, shorter, medium })}>
-        {dapp && <div className="container">{children}</div>}
-        {!dapp && children}
+      <main className={classnames('dapp', { short, shorter, medium })}>
+        {<div className="container">{children}</div>}
       </main>
-      {!dapp && <MarketingFooter locale={locale} />}
-      {dapp && <AppFooter dapp={dapp} locale={locale} onLocale={onLocale} />}
+      {<AppFooter locale={locale} onLocale={onLocale} />}
       <style jsx>{`
         .notice {
           background-color: black;
diff --git a/dapp/src/components/wrap/WrapHomepage.js b/dapp/src/components/wrap/WrapHomepage.js
index 791e29c8fc..d7b6d508e2 100644
--- a/dapp/src/components/wrap/WrapHomepage.js
+++ b/dapp/src/components/wrap/WrapHomepage.js
@@ -174,12 +174,6 @@ const WrapHomepage = ({
     const metadata = swapMetadata()
 
     try {
-      analytics.track('Before Wrap Transaction', {
-        category: 'wrap',
-        label: metadata.coinUsed,
-        value: metadata.swapAmount,
-      })
-
       let result
       if (swapMode === 'mint') {
         result = await signer(wousd).deposit(
@@ -206,12 +200,7 @@ const WrapHomepage = ({
       setStoredCoinValuesToZero()
       setInputAmount('')
 
-      const receipt = await rpcProvider.waitForTransaction(result.hash)
-      analytics.track('Wrap succeeded User source', {
-        category: 'wrap',
-        label: getUserSource(),
-        value: metadata.swapAmount,
-      })
+      await rpcProvider.waitForTransaction(result.hash)
       analytics.track('Wrap succeeded', {
         category: 'wrap',
         label: metadata.coinUsed,
diff --git a/dapp/src/utils/setLocale.js b/dapp/src/utils/setLocale.js
index 66344b94d1..2b57eaeeac 100644
--- a/dapp/src/utils/setLocale.js
+++ b/dapp/src/utils/setLocale.js
@@ -2,7 +2,7 @@ import { IntlViewerContext, init } from 'fbt-runtime'
 import Languages from 'constants/Languages'
 import analytics from './analytics'
 
-export default async function setLocale(newLocale, initialise = false) {
+export default async function setLocale(newLocale) {
   const existingLocale = localStorage.getItem('locale')
 
   let userLocale = newLocale || existingLocale
@@ -32,13 +32,6 @@ export default async function setLocale(newLocale, initialise = false) {
     }
   }
 
-  if (!initialise) {
-    analytics.track('Locale Change', {
-      fromLocale: existingLocale,
-      toLocale: newLocale,
-    })
-  }
-
   IntlViewerContext.locale = locale
   return locale
 }

From 7c232dd6d0a45f9bfa26e0250153362a608fb4ef Mon Sep 17 00:00:00 2001
From: rolandpo <rolopod@gmail.com>
Date: Mon, 27 Mar 2023 14:41:10 +0200
Subject: [PATCH 2/2] prettier

---
 dapp/src/components/AccountStatusDropdown.js |  2 +-
 dapp/src/components/Nav.js                   | 18 +++++++-----------
 dapp/src/components/layout.js                |  6 ++----
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/dapp/src/components/AccountStatusDropdown.js b/dapp/src/components/AccountStatusDropdown.js
index f3ccf491cf..69ec2d8fba 100644
--- a/dapp/src/components/AccountStatusDropdown.js
+++ b/dapp/src/components/AccountStatusDropdown.js
@@ -38,7 +38,7 @@ const AccountStatusDropdown = ({ className, showLogin }) => {
           }}
         >
           {/* The button id is used by StakeBoxBig to trigger connect when no wallet connected */}
-          {(!active && !account) && (
+          {!active && !account && (
             <GetOUSD
               id="main-dapp-nav-connect-wallet-button"
               className="btn-nav"
diff --git a/dapp/src/components/Nav.js b/dapp/src/components/Nav.js
index 43b5dea810..bedd128024 100644
--- a/dapp/src/components/Nav.js
+++ b/dapp/src/components/Nav.js
@@ -126,16 +126,12 @@ const Nav = ({ isMobile, locale, onLocale, page }) => {
     <>
       <nav
         className={classnames(
-          'navbar navbar-expand-lg d-flex justify-content-center flex-column dapp',
+          'navbar navbar-expand-lg d-flex justify-content-center flex-column dapp'
         )}
       >
-        <div
-          className='container flex-nowrap'
-        >
+        <div className="container flex-nowrap">
           <Link href={adjustLinkHref('/')}>
-            <a
-              className='navbar-brand d-flex flex-column justify-content-center'
-            >
+            <a className="navbar-brand d-flex flex-column justify-content-center">
               <img
                 src={assetRootPath('/images/origin-dollar-logo.svg')}
                 className="origin-logo"
@@ -208,7 +204,9 @@ const Nav = ({ isMobile, locale, onLocale, page }) => {
             <LanguageOptions locale={locale} onLocale={onLocale} />
           </div>
           <div
-            className={'navLinks collapse navbar-collapse justify-content-end flex-column flex-lg-row d-flex'}
+            className={
+              'navLinks collapse navbar-collapse justify-content-end flex-column flex-lg-row d-flex'
+            }
           >
             <button
               className="close navbar-toggler"
@@ -237,9 +235,7 @@ const Nav = ({ isMobile, locale, onLocale, page }) => {
                 </ul>
               )}
               <IPFSDappLink css="d-none d-lg-block" />
-              <div
-                className={`d-flex flex-column flex-lg-row-reverse`}
-              >
+              <div className={`d-flex flex-column flex-lg-row-reverse`}>
                 <AccountStatusDropdown />
               </div>
               <GetOUSD
diff --git a/dapp/src/components/layout.js b/dapp/src/components/layout.js
index 485d7871c2..dbac2f6ac1 100644
--- a/dapp/src/components/layout.js
+++ b/dapp/src/components/layout.js
@@ -152,12 +152,10 @@ const Layout = ({
           className={classnames(
             `notice ${showStakingBanner ? 'staking pt-2' : 'pt-3'} ${
               burnPage ? 'burn' : ''
-            } text-white text-center pb-3 dapp`,
+            } text-white text-center pb-3 dapp`
           )}
         >
-          <div
-            className='container d-flex flex-column flex-md-row align-items-center'
-          >
+          <div className="container d-flex flex-column flex-md-row align-items-center">
             {showStakingBanner ? (
               <>
                 <div className="d-flex flex-column mt-0 justify-content-center px-4 px-md-0 text-md-left">