Ledger Live fix connection errors

dapp/src/components/ConnectWalletModal/ConnectWalletButton.tsx

@@ -75,9 +75,9 @@ export default function ConnectWalletButton({
   const [isLoading, setIsLoading] = useState<boolean>(false)
 
   const hasConnectionError = connectionError || connectionStatus === "error"
-  const hasSignMessageStatus = signMessageStatus === "error"
-  const showStatuses = isSelected && !hasConnectionError
-  const showRetryButton = address && hasSignMessageStatus
+  const hasSignMessageErrorStatus = signMessageStatus === "error"
+  const shouldShowStatuses = isSelected && !hasConnectionError
+  const shouldShowRetryButton = address && hasSignMessageErrorStatus
 
   const onSuccessSignMessage = useCallback(() => {
     closeModal()
@@ -156,7 +156,7 @@ export default function ConnectWalletButton({
 
   const handleButtonClick = () => {
     // Do not trigger action again when wallet connection is in progress
-    if (showStatuses) return
+    if (shouldShowStatuses) return
 
     if (!isReconnecting) onDisconnect()
     resetConnectionError()
@@ -225,7 +225,7 @@ export default function ConnectWalletButton({
       </CardHeader>
 
       <AnimatePresence initial={false}>
-        {showStatuses && (
+        {shouldShowStatuses && (
           <CardBody
             as={motion.div}
             variants={collapseVariants}
@@ -256,7 +256,7 @@ export default function ConnectWalletButton({
                   status={signMessageStatus}
                   label="Sign message"
                 />
-                {showRetryButton && (
+                {shouldShowRetryButton && (
                   <Button
                     mt={4}
                     size="lg"

dapp/src/components/ConnectWalletModal/index.tsx

@@ -1,6 +1,12 @@
 import React, { useEffect, useState } from "react"
 import { ModalBody, ModalHeader, ModalCloseButton } from "@chakra-ui/react"
-import { useConnectors, useIsEmbed, useWalletConnectionError } from "#/hooks"
+import {
+  useConnectors,
+  useIsEmbed,
+  useIsSignedMessage,
+  useWallet,
+  useWalletConnectionError,
+} from "#/hooks"
 import { OrangeKitConnector, BaseModalProps, OnSuccessCallback } from "#/types"
 import withBaseModal from "../ModalRoot/withBaseModal"
 import ConnectWalletButton from "./ConnectWalletButton"
@@ -15,6 +21,7 @@ export function ConnectWalletModalBase({
   isReconnecting?: boolean
 } & BaseModalProps) {
   const { isEmbed } = useIsEmbed()
+  const { onDisconnect } = useWallet()
   const connectors = useConnectors()
   const enabledConnectors = connectors.map((connector) => ({
     ...connector,
@@ -23,6 +30,7 @@ export function ConnectWalletModalBase({
 
   const [selectedConnectorId, setSelectedConnectorId] = useState<string>()
   const { connectionError, resetConnectionError } = useWalletConnectionError()
+  const isSignedMessage = useIsSignedMessage()
 
   const handleButtonOnClick = (connector: OrangeKitConnector) => {
     setSelectedConnectorId(connector.id)
@@ -37,7 +45,15 @@ export function ConnectWalletModalBase({
   return (
     <>
       {withCloseButton && (
-        <ModalCloseButton onClick={() => resetConnectionError()} />
+        <ModalCloseButton
+          onClick={() => {
+            resetConnectionError()
+
+            if (!isSignedMessage) {
+              onDisconnect()
+            }
+          }}
+        />
       )}
       <ModalHeader>{`Select your ${isEmbed ? "account" : "wallet"}`}</ModalHeader>
 

dapp/src/hooks/useWallet.ts

@@ -155,7 +155,11 @@ export function useWallet(): UseWalletReturn {
 
   useEffect(() => {
     const fetchBitcoinAddress = async () => {
-      if (connector) {
+      if (
+        connector &&
+        typeof connector.getAccounts === "function" &&
+        typeof connector.getBitcoinAddress === "function"
+      ) {
         const btcAddress = await connector.getBitcoinAddress()
         const accounts = await connector.getAccounts()
 

dapp/src/utils/orangekit/ledger-live/tests/bitcoin-provider.test.ts

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import { BitcoinNetwork } from "@acre-btc/sdk"
 import { beforeAll, vi, expect, describe, it } from "vitest"
 import {