Merge branch 'main' into tbtc-api-retries

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/components/Layout.tsx

@@ -7,7 +7,6 @@ import { usePostHogPageViewCapture } from "#/hooks/posthog"
 import DocsDrawer from "./DocsDrawer"
 import Header from "./Header"
 import ModalRoot from "./ModalRoot"
-import Sidebar from "./Sidebar"
 import MobileModeBanner from "./MobileModeBanner"
 import Footer from "./Footer"
 
@@ -51,7 +50,6 @@ function Layout() {
       >
         <Outlet />
 
-        <Sidebar />
         <DocsDrawer />
         <ModalRoot />
       </Flex>

dapp/src/components/ModalRoot/withBaseModal.tsx

@@ -1,7 +1,7 @@
 import React, { ComponentType, useCallback } from "react"
 import { Modal, ModalContent, ModalOverlay, ModalProps } from "@chakra-ui/react"
 import { BaseModalProps } from "#/types"
-import { useAppNavigate, useSidebar } from "#/hooks"
+import { useAppNavigate } from "#/hooks"
 
 const MODAL_BASE_SIZE = "lg"
 
@@ -12,7 +12,6 @@ function withBaseModal<T extends BaseModalProps>(
   return function ModalBase(props: T) {
     const { closeModal, closeOnEsc, navigateToOnClose } = props
 
-    const { isOpen: isSidebarOpen } = useSidebar()
     const navigate = useAppNavigate()
 
     const handleCloseModal = useCallback(() => {
@@ -33,13 +32,7 @@ function withBaseModal<T extends BaseModalProps>(
         {...modalProps}
       >
         <ModalOverlay zIndex="modalOverlay" />
-        <ModalContent
-          zIndex="modalContent"
-          mr={{
-            base: isSidebarOpen ? "var(--chakra-sizes-sidebar_width)" : 0,
-            xl: 0,
-          }}
-        >
+        <ModalContent>
           <WrappedModalContent {...props} closeModal={handleCloseModal} />
         </ModalContent>
       </Modal>

dapp/src/components/TransactionModal/ActiveStakingStep/StakeFormModal/StakeDetails.tsx

@@ -1,7 +1,7 @@
 import React from "react"
 import { List } from "@chakra-ui/react"
-import TransactionDetailsAmountItem from "#/components/shared/TransactionDetails/AmountItem"
-import FeesDetailsAmountItem from "#/components/shared/FeesDetails/FeesItem"
+import TransactionDetailsAmountItem from "#/components/shared/TransactionDetails/TransactionDetailsAmountItem"
+import FeesDetailsAmountItem from "#/components/shared/FeesDetails/FeesDetailsAmountItem"
 import { TOKEN_AMOUNT_FIELD_NAME } from "#/components/shared/TokenAmountForm/TokenAmountFormBase"
 import { FeesTooltip } from "#/components/TransactionModal/FeesTooltip"
 import {

dapp/src/components/TransactionModal/ActiveUnstakingStep/UnstakeFormModal/UnstakeDetails.tsx

@@ -1,6 +1,5 @@
 import React from "react"
 import { List } from "@chakra-ui/react"
-import TransactionDetailsAmountItem from "#/components/shared/TransactionDetails/AmountItem"
 import { TOKEN_AMOUNT_FIELD_NAME } from "#/components/shared/TokenAmountForm/TokenAmountFormBase"
 import {
   useFormField,
@@ -9,7 +8,8 @@ import {
 } from "#/hooks"
 import { ACTION_FLOW_TYPES, CurrencyType } from "#/types"
 import { DESIRED_DECIMALS_FOR_FEE } from "#/constants"
-import FeesDetailsAmountItem from "#/components/shared/FeesDetails/FeesItem"
+import FeesDetailsAmountItem from "#/components/shared/FeesDetails/FeesDetailsAmountItem"
+import TransactionDetailsAmountItem from "#/components/shared/TransactionDetails/TransactionDetailsAmountItem"
 import { FeesTooltip } from "../../FeesTooltip"
 
 function UnstakeDetails({ currency }: { currency: CurrencyType }) {

dapp/src/components/shared/CurrencyBalance/index.tsx → dapp/src/components/shared/CurrencyBalance.tsx

@@ -12,7 +12,7 @@ import {
   numberToLocaleString,
 } from "#/utils"
 import { CurrencyType, AmountType } from "#/types"
-import Tooltip from "../Tooltip"
+import Tooltip from "./Tooltip"
 
 export type CurrencyBalanceProps = {
   currency: CurrencyType

dapp/src/components/shared/CurrencyBalanceWithConversion/index.tsx → dapp/src/components/shared/CurrencyBalanceWithConversion.tsx

@@ -1,6 +1,6 @@
 import React from "react"
 import { useCurrencyConversion } from "#/hooks"
-import { CurrencyBalance, CurrencyBalanceProps } from "../CurrencyBalance"
+import { CurrencyBalance, CurrencyBalanceProps } from "./CurrencyBalance"
 
 export function CurrencyBalanceWithConversion({
   from,

dapp/src/components/shared/TokenBalanceInput/index.tsx → dapp/src/components/shared/TokenBalanceInput.tsx

@@ -21,9 +21,9 @@ import { useCurrencyConversion } from "#/hooks"
 import NumberFormatInput, {
   NumberFormatInputValues,
   NumberFormatInputProps,
-} from "../NumberFormatInput"
-import { CurrencyBalance } from "../CurrencyBalance"
-import HelperErrorText, { HelperErrorTextProps } from "../Form/HelperErrorText"
+} from "./NumberFormatInput"
+import { CurrencyBalance } from "./CurrencyBalance"
+import HelperErrorText, { HelperErrorTextProps } from "./Form/HelperErrorText"
 
 type FiatCurrencyBalanceProps = {
   amount: bigint

dapp/src/contexts/index.tsx

@@ -1,5 +1,4 @@
 export * from "./DocsDrawerContext"
-export * from "./SidebarContext"
 export * from "./StakeFlowContext"
 export * from "./PaginationContext"
 export * from "./WalletConnectionAlertContext"

dapp/src/hooks/index.ts

@@ -2,7 +2,6 @@ export * from "./store"
 export * from "./sdk"
 export * from "./orangeKit"
 export * from "./useDetectThemeMode"
-export * from "./useSidebar"
 export * from "./useDocsDrawer"
 export * from "./useTransactionDetails"
 export * from "./useStakeFlowContext"
@@ -34,7 +33,6 @@ export { default as useTriggerConnectWalletModal } from "./useTriggerConnectWall
 export { default as useLastUsedBtcAddress } from "./useLastUsedBtcAddress"
 export { default as useAcrePoints } from "./useAcrePoints"
 export { default as useSignMessageAndCreateSession } from "./useSignMessageAndCreateSession"
-export { default as useScrollbarVisibility } from "./useScrollbarVisibility"
 export { default as useAccessCode } from "./useAccessCode"
 export { default as useFormField } from "./useFormField"
 export { default as useDepositBTCTransaction } from "./useDepositBTCTransaction"