Skip to content

Commit 121153d

Browse files
hsjoberghsjoberg
committed
Version 0.9.0
1 parent 9f1e592 commit 121153d

18 files changed

Lines changed: 107 additions & 439 deletions

‎bun.lock‎

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

‎ios/BlixtWallet.xcodeproj/project.pbxproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@
593593
CHAIN = mainnet;
594594
CLANG_ENABLE_MODULES = YES;
595595
CODE_SIGN_ENTITLEMENTS = BlixtWallet/BlixtWallet.entitlements;
596-
CURRENT_PROJECT_VERSION = 98;
596+
CURRENT_PROJECT_VERSION = 100;
597597
DEBUG = true;
598598
DEVELOPMENT_TEAM = AT26Z24V2Q;
599599
ENABLE_BITCODE = NO;
@@ -636,7 +636,7 @@
636636
CHAIN = mainnet;
637637
CLANG_ENABLE_MODULES = YES;
638638
CODE_SIGN_ENTITLEMENTS = BlixtWallet/BlixtWallet.entitlements;
639-
CURRENT_PROJECT_VERSION = 98;
639+
CURRENT_PROJECT_VERSION = 100;
640640
DEBUG = false;
641641
DEVELOPMENT_TEAM = AT26Z24V2Q;
642642
FLAVOR = "";
@@ -935,7 +935,7 @@
935935
CHAIN = regtest;
936936
CLANG_ENABLE_MODULES = YES;
937937
CODE_SIGN_ENTITLEMENTS = BlixtWallet/BlixtWallet.entitlements;
938-
CURRENT_PROJECT_VERSION = 98;
938+
CURRENT_PROJECT_VERSION = 100;
939939
DEBUG = true;
940940
DEVELOPMENT_TEAM = AT26Z24V2Q;
941941
ENABLE_BITCODE = NO;
@@ -1091,7 +1091,7 @@
10911091
CHAIN = regtest;
10921092
CLANG_ENABLE_MODULES = YES;
10931093
CODE_SIGN_ENTITLEMENTS = BlixtWallet/BlixtWallet.entitlements;
1094-
CURRENT_PROJECT_VERSION = 98;
1094+
CURRENT_PROJECT_VERSION = 100;
10951095
DEBUG = false;
10961096
DEVELOPMENT_TEAM = AT26Z24V2Q;
10971097
FLAVOR = "";
@@ -1246,7 +1246,7 @@
12461246
CHAIN = testnet;
12471247
CLANG_ENABLE_MODULES = YES;
12481248
CODE_SIGN_ENTITLEMENTS = BlixtWallet/BlixtWallet.entitlements;
1249-
CURRENT_PROJECT_VERSION = 98;
1249+
CURRENT_PROJECT_VERSION = 100;
12501250
DEBUG = true;
12511251
DEVELOPMENT_TEAM = AT26Z24V2Q;
12521252
ENABLE_BITCODE = NO;
@@ -1406,7 +1406,7 @@
14061406
CHAIN = signet;
14071407
CLANG_ENABLE_MODULES = YES;
14081408
CODE_SIGN_ENTITLEMENTS = BlixtWallet/BlixtWallet.entitlements;
1409-
CURRENT_PROJECT_VERSION = 98;
1409+
CURRENT_PROJECT_VERSION = 100;
14101410
DEBUG = true;
14111411
DEVELOPMENT_TEAM = AT26Z24V2Q;
14121412
ENABLE_BITCODE = NO;
@@ -1562,7 +1562,7 @@
15621562
CHAIN = testnet;
15631563
CLANG_ENABLE_MODULES = YES;
15641564
CODE_SIGN_ENTITLEMENTS = BlixtWallet/BlixtWallet.entitlements;
1565-
CURRENT_PROJECT_VERSION = 98;
1565+
CURRENT_PROJECT_VERSION = 100;
15661566
DEBUG = false;
15671567
DEVELOPMENT_TEAM = AT26Z24V2Q;
15681568
FLAVOR = "";
@@ -1713,7 +1713,7 @@
17131713
CHAIN = signet;
17141714
CLANG_ENABLE_MODULES = YES;
17151715
CODE_SIGN_ENTITLEMENTS = BlixtWallet/BlixtWallet.entitlements;
1716-
CURRENT_PROJECT_VERSION = 98;
1716+
CURRENT_PROJECT_VERSION = 100;
17171717
DEBUG = false;
17181718
DEVELOPMENT_TEAM = AT26Z24V2Q;
17191719
FLAVOR = "";
@@ -1868,7 +1868,7 @@
18681868
CHAIN = mainnet;
18691869
CLANG_ENABLE_MODULES = YES;
18701870
CODE_SIGN_ENTITLEMENTS = BlixtWallet/BlixtWallet.entitlements;
1871-
CURRENT_PROJECT_VERSION = 98;
1871+
CURRENT_PROJECT_VERSION = 100;
18721872
DEBUG = true;
18731873
DEVELOPMENT_TEAM = AT26Z24V2Q;
18741874
ENABLE_BITCODE = NO;
@@ -2024,7 +2024,7 @@
20242024
CHAIN = mainnet;
20252025
CLANG_ENABLE_MODULES = YES;
20262026
CODE_SIGN_ENTITLEMENTS = BlixtWallet/BlixtWallet.entitlements;
2027-
CURRENT_PROJECT_VERSION = 98;
2027+
CURRENT_PROJECT_VERSION = 100;
20282028
DEBUG = false;
20292029
DEVELOPMENT_TEAM = AT26Z24V2Q;
20302030
FLAVOR = fakelnd;

‎ios/Podfile.lock‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2137,28 +2137,6 @@ PODS:
21372137
- React-perflogger (= 0.84.0)
21382138
- React-utils (= 0.84.0)
21392139
- ReactNativeDependencies
2140-
- ReactNativeCameraKit (15.1.0):
2141-
- hermes-engine
2142-
- RCTRequired
2143-
- RCTTypeSafety
2144-
- React-Core
2145-
- React-Core-prebuilt
2146-
- React-debug
2147-
- React-Fabric
2148-
- React-featureflags
2149-
- React-graphics
2150-
- React-ImageManager
2151-
- React-jsi
2152-
- React-NativeModulesApple
2153-
- React-RCTFabric
2154-
- React-renderercss
2155-
- React-rendererdebug
2156-
- React-utils
2157-
- ReactCodegen
2158-
- ReactCommon/turbomodule/bridging
2159-
- ReactCommon/turbomodule/core
2160-
- ReactNativeDependencies
2161-
- Yoga
21622140
- ReactNativeDependencies (0.84.0)
21632141
- ReactNativeNitroTor (0.5.2):
21642142
- hermes-engine
@@ -2706,7 +2684,6 @@ DEPENDENCIES:
27062684
- ReactAppDependencyProvider (from `build/generated/ios/ReactAppDependencyProvider`)
27072685
- ReactCodegen (from `build/generated/ios/ReactCodegen`)
27082686
- ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
2709-
- ReactNativeCameraKit (from `../node_modules/react-native-camera-kit`)
27102687
- ReactNativeDependencies (from `../node_modules/react-native/third-party-podspecs/ReactNativeDependencies.podspec`)
27112688
- ReactNativeNitroTor (from `../node_modules/react-native-nitro-tor`)
27122689
- "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
@@ -2912,8 +2889,6 @@ EXTERNAL SOURCES:
29122889
:path: build/generated/ios/ReactCodegen
29132890
ReactCommon:
29142891
:path: "../node_modules/react-native/ReactCommon"
2915-
ReactNativeCameraKit:
2916-
:path: "../node_modules/react-native-camera-kit"
29172892
ReactNativeDependencies:
29182893
:podspec: "../node_modules/react-native/third-party-podspecs/ReactNativeDependencies.podspec"
29192894
ReactNativeNitroTor:
@@ -3051,7 +3026,6 @@ SPEC CHECKSUMS:
30513026
ReactAppDependencyProvider: 625d2f6d9d5ef01acc9dfe2b5385504bbffd2ad0
30523027
ReactCodegen: af15126e35c0260118ad333603cb54124ca37f2c
30533028
ReactCommon: cc0e38600f82487c5fe5d29150abb6fa9d981986
3054-
ReactNativeCameraKit: 6657e25a0fe319bb6a5d32ac5f03a580b712de82
30553029
ReactNativeDependencies: ef325a74b29d701c5910bd0d112b287b75c82210
30563030
ReactNativeNitroTor: 9fac0d418f3ceb44ff0c641794075450542f403d
30573031
RNCAsyncStorage: e85a99325df9eb0191a6ee2b2a842644c7eb29f4

‎package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@
100100
"react-native": "0.84.0",
101101
"react-native-animatable": "^1.4.0",
102102
"react-native-build-config": "github:hsjoberg/react-native-build-config#53b2e6dcababc465fef13dfa0a11cb3edd7e95b3",
103-
"react-native-camera-kit": "15.1.0",
104103
"react-native-dialogs": "github:hsjoberg/react-native-dialogs#0ae8e9713786e80b2bac3da290a44e448e0fa2db",
105104
"react-native-easy-grid": "0.2.2",
106105
"react-native-electron": "^0.22.1",

‎src/components/Camera.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export default function CameraComponent({ children, onNotAuthorized, onRead, act
2222
const codeScanner = useCodeScanner({
2323
codeTypes: ["qr"],
2424
onCodeScanned: (codes) => {
25-
if (codes.length >= 0) {
25+
if (codes.length > 0) {
2626
onRead?.(codes[0].value ?? "");
2727
}
2828
},

‎src/components/FooterNav.tsx‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import { useNavigation, NavigationProp } from "@react-navigation/core";
55

66
import { useTranslation } from "react-i18next";
77
import { namespaces } from "../i18n/i18n.constants";
8-
import { NavigationRootStackParamList } from "../types";
8+
import { RootStackParamList } from "../Main";
99

1010
export default function FooterNav() {
11-
const navigation = useNavigation<NavigationProp<NavigationRootStackParamList>>();
11+
const navigation = useNavigation<NavigationProp<RootStackParamList>>();
1212
const t = useTranslation(namespaces.footerNav).t;
1313

1414
return (
@@ -20,13 +20,7 @@ export default function FooterNav() {
2020
</Button>
2121
</FooterTab>
2222
<FooterTab>
23-
<Button
24-
testID="FOOTER_SEND"
25-
onPress={() => navigation.navigate("Send", { params: { viaSwipe: false } })}
26-
onLongPress={() => {
27-
navigation.navigate("Send", { screen: "SendCameraKit", params: { viaSwipe: false } });
28-
}}
29-
>
23+
<Button testID="FOOTER_SEND" onPress={() => navigation.navigate("Send")}>
3024
<Icon type="AntDesign" name="camerao" />
3125
<Text>{t("send")}</Text>
3226
</Button>

‎src/hooks/usePromptLightningAddress.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { Alert } from "../utils/alert";
22
import { useStoreActions } from "../state/store";
33
import { useNavigation, NavigationProp } from "@react-navigation/core";
4-
import { NavigationRootStackParamList } from "../types";
4+
import { RootStackParamList } from "../Main";
55

66
export default function usePromptLightningAddress() {
77
const resolveLightningAddress = useStoreActions((store) => store.lnUrl.resolveLightningAddress);
8-
const navigation = useNavigation<NavigationProp<NavigationRootStackParamList>>();
8+
const navigation = useNavigation<NavigationProp<RootStackParamList>>();
99

1010
return () =>
1111
new Promise<[boolean, string?]>((resolve, reject) => {
@@ -20,7 +20,7 @@ export default function usePromptLightningAddress() {
2020
},
2121
{
2222
text: "Ok",
23-
onPress: async (text) => {
23+
onPress: async (text?: string) => {
2424
try {
2525
const lightningAddress = (text ?? "").trim();
2626
navigation.navigate("LoadingModal");

‎src/types.d.ts‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎src/windows/CameraFullscreen.tsx‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useState } from "react";
1+
import React, { useRef, useState } from "react";
22
import { StatusBar, StyleSheet } from "react-native";
33

44
import Camera from "../components/Camera";
@@ -20,8 +20,16 @@ interface ICameraFullscreenProps {
2020
}
2121

2222
export default function CameraFullscreen({ navigation, route }: ICameraFullscreenProps) {
23-
const [onReadCalled, setOnReadCalled] = useState(false);
23+
const [cameraActive, setCameraActive] = useState(true);
24+
const onReadHandled = useRef(false);
2425
const onRead = route.params.onRead ?? (() => {});
26+
27+
const closeScreen = () => {
28+
if (navigation.canGoBack()) {
29+
navigation.pop();
30+
}
31+
};
32+
2533
return (
2634
<Container>
2735
<StatusBar
@@ -32,14 +40,20 @@ export default function CameraFullscreen({ navigation, route }: ICameraFullscree
3240
barStyle="light-content"
3341
/>
3442
<Camera
43+
active={cameraActive}
3544
onRead={(data) => {
36-
if (!onReadCalled) {
37-
onRead(data);
38-
navigation.pop();
39-
setOnReadCalled(true);
45+
if (onReadHandled.current || !data) {
46+
return;
4047
}
48+
49+
onReadHandled.current = true;
50+
setCameraActive(false);
51+
onRead(data);
52+
closeScreen();
53+
}}
54+
onNotAuthorized={() => {
55+
setTimeout(() => closeScreen(), 1);
4156
}}
42-
onNotAuthorized={() => setTimeout(() => navigation.pop(), 1)}
4357
>
4458
<>
4559
<BarcodeMask

‎src/windows/Contacts/Contact.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import { fontFactorNormalized } from "../../utils/scale";
1818
import { useTranslation } from "react-i18next";
1919
import { namespaces } from "../../i18n/i18n.constants";
2020
import { blixtTheme } from "../../native-base-theme/variables/commonColor";
21-
import { NavigationRootStackParamList } from "../../types";
2221

2322
import { subscribeInvoices } from "react-native-turbo-lnd";
2423
import { Invoice_InvoiceState } from "react-native-turbo-lnd/protos/lightning_pb";
@@ -30,7 +29,7 @@ interface IContactProps {
3029

3130
export default function Contact({ contact }: IContactProps) {
3231
const t = useTranslation(namespaces.contacts.contactList).t;
33-
const navigation = useNavigation<NavigationProp<NavigationRootStackParamList>>();
32+
const navigation = useNavigation<NavigationProp<any>>();
3433

3534
const setLNUrl = useStoreActions((store) => store.lnUrl.setLNUrl);
3635
const resolveLightningAddress = useStoreActions((store) => store.lnUrl.resolveLightningAddress);

0 commit comments

Comments
 (0)