Merge branch 'main' into wallet-connection-info-alert-v2

dapp/.env

@@ -23,7 +23,6 @@ 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"

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",

dapp/src/DApp.tsx

@@ -9,7 +9,6 @@ import { AcreSdkProvider } from "./acre-react/contexts"
 import GlobalStyles from "./components/GlobalStyles"
 import {
   DocsDrawerContextProvider,
-  SidebarContextProvider,
   WalletConnectionAlertContextProvider,
 } from "./contexts"
 import { useInitApp } from "./hooks"
@@ -67,15 +66,13 @@ function DAppProviders() {
         <QueryClientProvider client={queryClient}>
           <AcreSdkProvider>
             <DocsDrawerContextProvider>
-              <SidebarContextProvider>
-                <WalletConnectionAlertContextProvider>
-                  <ReduxProvider store={store}>
-                    <PostHogProvider>
-                      <DApp />
-                    </PostHogProvider>
-                  </ReduxProvider>
-                </WalletConnectionAlertContextProvider>
-              </SidebarContextProvider>
+              <WalletConnectionAlertContextProvider>
+                <ReduxProvider store={store}>
+                  <PostHogProvider>
+                    <DApp />
+                  </PostHogProvider>
+                </ReduxProvider>
+              </WalletConnectionAlertContextProvider>
             </DocsDrawerContextProvider>
           </AcreSdkProvider>
         </QueryClientProvider>

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"