Skip to content

Commit 70433a1

Browse files
Merge pull request #287 from SwissBitcoinPay/support-bitcoinize-2.1-printing
Support Bitcoinize 2.1 printing
2 parents 5b29a91 + 2b58286 commit 70433a1

File tree

7 files changed

+14
-12
lines changed

7 files changed

+14
-12
lines changed

.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
APP_VERSION=2.5.11
1+
APP_VERSION=2.5.12
22

3-
APP_BUILD_NUMBER=439
3+
APP_BUILD_NUMBER=440
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Support ticket printing on Bitcoinize v2.1
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Support de l'impression du ticket sur Bitcoinize v2.1

package-lock.json

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
"react-native-keychain": "9.2.3",
9696
"react-native-linear-gradient": "2.8.3",
9797
"react-native-nfc-manager": "3.16.1",
98-
"react-native-nyx-printer": "github:SwissBitcoinPay/react-native-nyx-printer#4b31680",
98+
"react-native-nyx-printer": "github:SwissBitcoinPay/react-native-nyx-printer#83b4006",
9999
"react-native-picker-select": "9.3.1",
100100
"react-native-progress": "5.0.1",
101101
"react-native-qrcode-svg": "6.3.14",

src/config/platform/platform.native.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@ const isTablet = DeviceInfo.isTablet();
2222

2323
const device = getDeviceSync();
2424

25-
const isBitcoinize = ["BTC21PRO", "Bitcoinize Machine"].includes(device);
25+
const model = DeviceInfo.getModel();
26+
27+
const isBitcoinize =
28+
["BTC21PRO", "Bitcoinize Machine"].includes(device) ||
29+
model === "Bitcoinize-BTC21PRO";
2630

2731
export const platform = {
2832
isWeb: false,
@@ -31,7 +35,7 @@ export const platform = {
3135
isIos,
3236
isDesktop: false,
3337
isMobile,
34-
model: DeviceInfo.getModel(),
38+
model,
3539
maxContentWidth: 520,
3640
isTablet,
3741
isIphoneX,

src/hooks/usePrintInvoiceTicket.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
import { InvoiceType } from "@screens/Invoice/Invoice";
22
import { MarkOptional } from "ts-essentials";
3-
import {
4-
NyxAlign,
5-
NyxFontStyle
6-
} from "react-native-nyx-printer/src/NyxTextFormat";
3+
import { NyxAlign, NyxFontStyle } from "react-native-nyx-printer";
74
import {
85
AsyncStorage,
96
getImageSize,

0 commit comments

Comments
 (0)