Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
APP_VERSION=2.5.12
APP_VERSION=2.5.13

APP_BUILD_NUMBER=440
APP_BUILD_NUMBER=441
1 change: 0 additions & 1 deletion fastlane/metadata/android/en-US/changelogs/440.txt

This file was deleted.

2 changes: 2 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/441.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Support ticket printing on Bitcoinize v2.1
- Fixed BitBox02 connection on Android
2 changes: 2 additions & 0 deletions fastlane/metadata/android/fr-FR/changelogs/441.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Support de l'impression du ticket sur Bitcoinize v2.1
- Corrigé la connexion avec les BitBox02 sur Android
8 changes: 6 additions & 2 deletions src/components/ConnectWalletModal/ConnectWalletModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -130,13 +130,17 @@ export const ConnectWalletModal = ({
case HardwareState.Pairing:
return { Component: PairingScreen };
case HardwareState.Setup:
return { Component: SetupScreen };
return { Component: SetupScreen, ...screenComponentProps };
case HardwareState.AfterSetup:
return { Component: AfterSetupScreen, ...screenComponentProps };
case HardwareState.Signature:
return {
Component: SignatureScreen,
componentProps: { customFunction }
...screenComponentProps,
componentProps: {
...(screenComponentProps.componentProps || {}),
customFunction
}
};
default:
return {};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ export const SBPBitboxContextProvider = ({ children }: PropsWithChildren) => {

const screenComponentProps = useMemo(() => {
let obj = {};
if (backupMode !== "sdcard") {
if (backupMode && backupMode !== "sdcard") {
obj = {
...obj,
buttonProps: {
Expand All @@ -412,15 +412,18 @@ export const SBPBitboxContextProvider = ({ children }: PropsWithChildren) => {
if (deviceMode === "bitbox02") {
obj = {
...obj,
deviceId,
status
componentProps: {
deviceId,
status
}
};
} else if (deviceMode === "bitbox02-bootloader") {
obj = {
...obj,
deviceId,

status: bootloaderStatus
componentProps: {
deviceId,
status: bootloaderStatus
}
};
}

Expand Down
Loading