Merge branch 'main' into in-progress-tooltip

dapp/.env

@@ -18,13 +18,17 @@ VITE_GELATO_RELAY_API_KEY="htaJCy_XHj8WsE3w53WBMurfySDtjLP_TrNPPa6IPIc_"  # this
 # Get the API key from: https://thegraph.com/studio/apikeys/.
 VITE_SUBGRAPH_API_KEY=""
 
+# Posthog
+VITE_POSTHOG_API_HOST="https://us.i.posthog.com"
+VITE_POSTHOG_API_KEY=""
+
 # Feature flags
-VITE_FEATURE_FLAG_GAMIFICATION_ENABLED="false"
 VITE_FEATURE_FLAG_WITHDRAWALS_ENABLED="false"
 VITE_FEATURE_FLAG_OKX_WALLET_ENABLED="false"
 VITE_FEATURE_FLAG_XVERSE_WALLET_ENABLED="false"
 VITE_FEATURE_FLAG_ACRE_POINTS_ENABLED="true"
 VITE_FEATURE_FLAG_TVL_ENABLED="true"
 VITE_FEATURE_GATING_DAPP_ENABLED="true"
+VITE_FEATURE_POSTHOG_ENABLED="true"
 VITE_FEATURE_MOBILE_MODE_ENABLED="true"
 

dapp/README.md

@@ -1,10 +1,10 @@
 # Acre dApp
 
-The application is integrate with OrangeKit and allows people to earn yield on their Bitcoin via yield farming on Ethereum.
+The application is integrated with OrangeKit and allows people to earn yield on their Bitcoin via yield farming on Ethereum.
 
 This project was bootstrapped with [Create Vite](https://github.com/vitejs/vite/tree/main/packages/create-vite).
 
-To access the dApp in Ledger Live import manifest as described in the
+To access the dApp in Ledger Live import the manifest as described in the
 [Ledger Live Setup](#ledger-live-setup) section.
 
 ### Development
@@ -29,7 +29,7 @@ Install dependencies and start the dApp:
 
 ### Environmental variables
 
-To make sure dApp is running correctly, include the following variables in `.env` file:
+To make sure dApp is running correctly, include the following variables in the `.env` file:
 
 ```bash
     VITE_TBTC_API_ENDPOINT=

dapp/package.json

@@ -24,7 +24,7 @@
     "@ledgerhq/wallet-api-acre-module": "0.1.0",
     "@ledgerhq/wallet-api-client": "1.6.0",
     "@orangekit/react": "1.0.0-beta.34",
-    "@orangekit/sign-in-with-wallet": "1.0.0-beta.6",
+    "@orangekit/sign-in-with-wallet": "1.0.0-beta.7",
     "@reduxjs/toolkit": "^2.2.0",
     "@rehooks/local-storage": "^2.4.5",
     "@safe-global/safe-core-sdk-types": "^5.0.1",
@@ -40,6 +40,7 @@
     "framer-motion": "^10.16.5",
     "luxon": "^3.5.0",
     "mustache": "^4.2.0",
+    "posthog-js": "^1.186.1",
     "react": "^18.2.0",
     "react-confetti-explosion": "^2.1.2",
     "react-dom": "^18.2.0",

dapp/src/DApp.tsx

@@ -9,8 +9,7 @@ import { AcreSdkProvider } from "./acre-react/contexts"
 import GlobalStyles from "./components/GlobalStyles"
 import {
   DocsDrawerContextProvider,
-  SidebarContextProvider,
-  WalletConnectionErrorContextProvider,
+  WalletConnectionAlertContextProvider,
 } from "./contexts"
 import { useInitApp } from "./hooks"
 import { router } from "./router"
@@ -19,6 +18,7 @@ import getWagmiConfig from "./wagmiConfig"
 import queryClient from "./queryClient"
 import { delay, logPromiseFailure } from "./utils"
 import { AcreLogo } from "./assets/icons"
+import PostHogProvider from "./posthog/PostHogProvider"
 
 function SplashPage() {
   return (
@@ -66,13 +66,13 @@ function DAppProviders() {
         <QueryClientProvider client={queryClient}>
           <AcreSdkProvider>
             <DocsDrawerContextProvider>
-              <SidebarContextProvider>
-                <WalletConnectionErrorContextProvider>
-                  <ReduxProvider store={store}>
+              <WalletConnectionAlertContextProvider>
+                <ReduxProvider store={store}>
+                  <PostHogProvider>
                     <DApp />
-                  </ReduxProvider>
-                </WalletConnectionErrorContextProvider>
-              </SidebarContextProvider>
+                  </PostHogProvider>
+                </ReduxProvider>
+              </WalletConnectionAlertContextProvider>
             </DocsDrawerContextProvider>
           </AcreSdkProvider>
         </QueryClientProvider>