Merge Master to shubham/wiring-up-endpoints

ZeusLN · May 23, 2024 · e1a792c · e1a792c
2 parents 5b3892d + 3ffe334
commit e1a792c
Show file tree

Hide file tree

Showing 57 changed files with 1,808 additions and 1,793 deletions.
diff --git a/App.tsx b/App.tsx
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -103,7 +103,6 @@ android {
         versionCode 84
         versionName "0.9.0-alpha4"
         multiDexEnabled true
-        missingDimensionStrategy 'react-native-camera', 'general'
     }
     signingConfigs {
         release {

diff --git a/android/build.gradle b/android/build.gradle
@@ -25,9 +25,7 @@ buildscript {
         classpath("com.android.tools.build:gradle")
         classpath("com.facebook.react:react-native-gradle-plugin")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
-
-        // Needed for react-native-camera-kit
-        classpath("com.google.protobuf:protobuf-gradle-plugin:0.9.3")
+        classpath("com.google.protobuf:protobuf-gradle-plugin:0.9.4")
 
         // LN address notifications
         classpath("com.google.gms:google-services:4.3.15")

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -42,5 +42,5 @@ newArchEnabled=false
 # If set to false, you will be using JSC instead.
 hermesEnabled=true
 
-# Necessary for react-native-camera-kit
-kotlin_version=1.8.0
+# Necessary for react-native-vision-camera QR code scanning
+VisionCamera_enableCodeScanner=true
diff --git a/android/link-assets-manifest.json b/android/link-assets-manifest.json
@@ -165,10 +165,6 @@
       "path": "assets/images/SVG/DynamicSVG/OnChainSvg.tsx",
       "sha1": "e959c75860607b476bca2b0a9078cb3cb46eb23e"
     },
-    {
-      "path": "assets/images/SVG/DynamicSVG/ScanFrameSvg.tsx",
-      "sha1": "7485e1c143ccdfadb765d53dc9fc1626b251a637"
-    },
     {
       "path": "assets/images/SVG/DynamicSVG/UnifiedSvg.tsx",
       "sha1": "e61cf6ad20fb18b3919d84a47bd4db8b0ab7bc4a"

diff --git a/assets/images/SVG/DynamicSVG/ScanFrameSvg.tsx b/assets/images/SVG/DynamicSVG/ScanFrameSvg.tsx
diff --git a/assets/images/SVG/Flash Off.svg b/assets/images/SVG/Flash Off.svg
diff --git a/assets/images/SVG/Flash On.svg b/assets/images/SVG/Flash On.svg
diff --git a/assets/images/SVG/Gallery.svg b/assets/images/SVG/Gallery.svg
diff --git a/components/Button.tsx b/components/Button.tsx
@@ -1,12 +1,12 @@
 import * as React from 'react';
 import { Button as ElementsButton } from 'react-native-elements';
 import { themeColor } from './../utils/ThemeUtils';
-import { StyleProp, ViewStyle } from 'react-native';
+import { StyleProp, TextStyle, ViewStyle } from 'react-native';
 
 interface ButtonProps {
     title?: string;
     icon?: any;
-    titleStyle?: any;
+    titleStyle?: TextStyle;
     onPress?: any;
     secondary?: boolean;
     tertiary?: boolean;

diff --git a/components/Header.tsx b/components/Header.tsx
@@ -13,6 +13,7 @@ import { themeColor } from '../utils/ThemeUtils';
 
 import ArrowLeft from '../assets/images/SVG/Arrow_left.svg';
 import Close from '../assets/images/SVG/Close.svg';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 interface HeaderIcon extends IconObject {
     icon?: string;
@@ -32,7 +33,7 @@ interface HeaderProps {
     rightComponent?: React.ReactElement<{}> | TextProps | HeaderIcon;
     containerStyle?: ViewStyle;
     placement?: 'left' | 'center' | 'right' | undefined;
-    navigation?: any;
+    navigation?: StackNavigationProp<any, any>;
     onBack?: () => void;
     navigateBackOnBackPress?: boolean;
 }
@@ -46,7 +47,7 @@ function ZeusHeader(props: HeaderProps) {
             onPress={() => {
                 if (onBack) onBack();
                 if (navigateBackOnBackPress) {
-                    props.navigation.goBack();
+                    props.navigation!.goBack();
                 }
             }}
             accessibilityLabel={localeString('general.goBack')}
@@ -64,7 +65,7 @@ function ZeusHeader(props: HeaderProps) {
         <TouchableOpacity
             onPress={() => {
                 if (onBack) onBack();
-                props.navigation.goBack();
+                props.navigation!.goBack();
             }}
             accessibilityLabel={localeString('general.close')}
         >