Merge branch 'main' of github.com:thesis/acre into fix-empty-provider

dapp/.env.example

@@ -0,0 +1,32 @@
+# Network
+VITE_USE_TESTNET=true
+
+# Basic UI settings
+VITE_REFERRAL=0
+
+# Endpoints
+VITE_ETH_HOSTNAME_HTTP=""
+VITE_ACRE_API_ENDPOINT="http://localhost:8788/api/v1/"
+VITE_TBTC_API_ENDPOINT="http://localhost:8788/tbtc-api/v1/"
+
+# API keys
+VITE_GELATO_RELAY_API_KEY="htaJCy_XHj8WsE3w53WBMurfySDtjLP_TrNPPa6IPIc_"  # this key should not be used on production
+VITE_SUBGRAPH_API_KEY=""
+
+# Sentry
+VITE_SENTRY_SUPPORT=false
+VITE_SENTRY_DSN=""
+
+# Posthog
+VITE_POSTHOG_API_HOST="https://us.i.posthog.com"
+VITE_POSTHOG_API_KEY=""
+
+# Feature flags
+VITE_FEATURE_FLAG_WITHDRAWALS_ENABLED="true"
+VITE_FEATURE_FLAG_OKX_WALLET_ENABLED="true"
+VITE_FEATURE_FLAG_XVERSE_WALLET_ENABLED="true"
+VITE_FEATURE_FLAG_ACRE_POINTS_ENABLED="true"
+VITE_FEATURE_FLAG_TVL_ENABLED="true"
+VITE_FEATURE_GATING_DAPP_ENABLED="true"
+VITE_FEATURE_POSTHOG_ENABLED="false"
+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/manifests/ledger-live/ledger-live-manifest-development.json

@@ -23,6 +23,7 @@
     "account.list",
     "bitcoin.getAddress",
     "bitcoin.getPublicKey",
+    "bitcoin.getXPub",
     "transaction.signAndBroadcast",
     "custom.acre.messageSign",
     "custom.acre.transactionSignAndBroadcast"

dapp/manifests/ledger-live/ledger-live-manifest-mainnet.json

@@ -23,6 +23,7 @@
     "account.list",
     "bitcoin.getAddress",
     "bitcoin.getPublicKey",
+    "bitcoin.getXPub",
     "transaction.signAndBroadcast",
     "custom.acre.messageSign",
     "custom.acre.transactionSignAndBroadcast"

dapp/manifests/ledger-live/ledger-live-manifest-testnet.json

@@ -23,6 +23,7 @@
     "account.list",
     "bitcoin.getAddress",
     "bitcoin.getPublicKey",
+    "bitcoin.getXPub",
     "transaction.signAndBroadcast",
     "custom.acre.messageSign",
     "custom.acre.transactionSignAndBroadcast"

dapp/manifests/ledger-live/ledger-manifest-template.json

@@ -23,6 +23,7 @@
     "account.list",
     "bitcoin.getAddress",
     "bitcoin.getPublicKey",
+    "bitcoin.getXPub",
     "transaction.signAndBroadcast",
     "custom.acre.messageSign",
     "custom.acre.transactionSignAndBroadcast"

dapp/package.json

@@ -23,8 +23,8 @@
     "@emotion/styled": "^11.11.0",
     "@ledgerhq/wallet-api-acre-module": "0.1.0",
     "@ledgerhq/wallet-api-client": "1.6.0",
-    "@orangekit/react": "1.0.0-beta.33",
-    "@orangekit/sign-in-with-wallet": "1.0.0-beta.6",
+    "@orangekit/react": "1.0.0-beta.34",
+    "@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

@@ -7,18 +7,15 @@ import { QueryClientProvider } from "@tanstack/react-query"
 import { ReactQueryDevtools } from "@tanstack/react-query-devtools"
 import { AcreSdkProvider } from "./acre-react/contexts"
 import GlobalStyles from "./components/GlobalStyles"
-import {
-  DocsDrawerContextProvider,
-  SidebarContextProvider,
-  WalletConnectionErrorContextProvider,
-} from "./contexts"
+import { WalletConnectionAlertContextProvider } from "./contexts"
 import { useInitApp } from "./hooks"
 import { router } from "./router"
 import { store } from "./store"
 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 (
@@ -65,15 +62,13 @@ function DAppProviders() {
       <WagmiProvider config={config}>
         <QueryClientProvider client={queryClient}>
           <AcreSdkProvider>
-            <DocsDrawerContextProvider>
-              <SidebarContextProvider>
-                <WalletConnectionErrorContextProvider>
-                  <ReduxProvider store={store}>
-                    <DApp />
-                  </ReduxProvider>
-                </WalletConnectionErrorContextProvider>
-              </SidebarContextProvider>
-            </DocsDrawerContextProvider>
+            <WalletConnectionAlertContextProvider>
+              <ReduxProvider store={store}>
+                <PostHogProvider>
+                  <DApp />
+                </PostHogProvider>
+              </ReduxProvider>
+            </WalletConnectionAlertContextProvider>
           </AcreSdkProvider>
         </QueryClientProvider>
       </WagmiProvider>

dapp/src/assets/icons/index.ts

@@ -1,4 +1,3 @@
-export * from "./ArrowUpRight"
 export * from "./AcreLogo"
 export * from "./Pause"
 export { default as LoadingSpinnerSuccessIcon } from "./LoadingSpinnerSuccessIcon"
@@ -8,4 +7,3 @@ export * from "./MezoSignIcon"
 export * from "./AcreSignIcon"
 export * from "./BitcoinsStackErrorIcon"
 export { default as MatsIcon } from "./MatsIcon"
-export { default as BoltFilled } from "./BoltFilled"