Merge branch 'master' into shubham/error-handling

ZeusLN · Mar 26, 2024 · 0636c9a · 0636c9a
2 parents 41090ab + 4a16ae8
commit 0636c9a
Show file tree

Hide file tree

Showing 62 changed files with 1,213 additions and 692 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -29,17 +29,11 @@ body:
       label: ZEUS version
       description: What version of ZEUS were you running when the bug occurred?
       options:
+        - v0.8.3
         - v0.8.2
         - v0.8.1
         - v0.8.0
-        - v0.7.7
-        - v0.7.6
-        - v0.7.5
-        - v0.7.4
-        - v0.7.3
-        - v0.7.2
-        - v0.7.1
-        - v0.7.0
+        - Older (specify in comments)
   - type: dropdown
     id: interface
     attributes:

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -99,8 +99,8 @@ android {
         applicationId "app.zeusln.zeus"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 82
-        versionName "0.8.2"
+        versionCode 84
+        versionName "0.8.3-alpha"
         multiDexEnabled true
         missingDimensionStrategy 'react-native-camera', 'general'
     }

diff --git a/backends/EmbeddedLND.ts b/backends/EmbeddedLND.ts
@@ -90,9 +90,7 @@ export default class EmbeddedLND extends LND {
             max_shard_amt: data?.max_shard_amt,
             fee_limit_sat: data?.fee_limit_sat || 0,
             outgoing_chan_id: data?.outgoing_chan_id,
-            last_hop_pubkey: data?.last_hop_pubkey
-                ? Base64Utils.base64ToHex(data?.last_hop_pubkey)
-                : undefined,
+            last_hop_pubkey: data?.last_hop_pubkey,
             message: data?.message
                 ? Base64Utils.hexToBase64(Base64Utils.utf8ToHex(data?.message))
                 : undefined,

diff --git a/components/Modals/InfoModal.tsx b/components/Modals/InfoModal.tsx
@@ -11,6 +11,7 @@ import ModalStore from '../../stores/ModalStore';
 
 import { localeString } from '../../utils/LocaleUtils';
 import UrlUtils from '../../utils/UrlUtils';
+import { themeColor } from '../../utils/ThemeUtils';
 
 interface InfoModalProps {
     ModalStore: ModalStore;
@@ -48,7 +49,7 @@ export default class InfoModal extends React.Component<InfoModalProps, {}> {
                 >
                     <View
                         style={{
-                            backgroundColor: 'white',
+                            backgroundColor: themeColor('secondary'),
                             borderRadius: 30,
                             padding: 30,
                             width: '100%',
@@ -63,6 +64,7 @@ export default class InfoModal extends React.Component<InfoModalProps, {}> {
                             <Text
                                 style={{
                                     fontFamily: 'PPNeueMontreal-Book',
+                                    color: themeColor('text'),
                                     fontSize: 20,
                                     marginBottom: 40
                                 }}
@@ -77,6 +79,7 @@ export default class InfoModal extends React.Component<InfoModalProps, {}> {
                                     key={index}
                                     style={{
                                         fontFamily: 'PPNeueMontreal-Book',
+                                        color: themeColor('text'),
                                         fontSize: 20,
                                         marginBottom: 40
                                     }}

diff --git a/components/OnchainFeeInput.tsx b/components/OnchainFeeInput.tsx
@@ -89,10 +89,6 @@ export default function OnchainFeeInput(props: OnchainFeeInputProps) {
                         setNewFee(text);
                         onChangeFee(text);
                     }}
-                    style={{
-                        paddingTop: 10,
-                        paddingBottom: 10
-                    }}
                 />
             )}
         </>

diff --git a/components/SetFeesForm.tsx b/components/SetFeesForm.tsx
@@ -78,8 +78,8 @@ export default class SetFeesForm extends React.Component<
             timeLockDelta,
             channelPoint,
             channelId,
-            minHTLC,
-            maxHTLC,
+            minHtlc,
+            maxHtlc,
             setFeesCompleted
         } = this.props;
         const {
@@ -182,7 +182,7 @@ export default class SetFeesForm extends React.Component<
                         </Text>
                         <TextInput
                             keyboardType="numeric"
-                            placeholder={minHTLC || '1'}
+                            placeholder={minHtlc || '1'}
                             value={newMinHtlc}
                             onChangeText={(text: string) =>
                                 this.setState({
@@ -203,7 +203,7 @@ export default class SetFeesForm extends React.Component<
                         </Text>
                         <TextInput
                             keyboardType="numeric"
-                            placeholder={maxHTLC || '250000'}
+                            placeholder={maxHtlc || '250000'}
                             value={newMaxHtlc}
                             onChangeText={(text: string) =>
                                 this.setState({

diff --git a/components/WalletHeader.tsx b/components/WalletHeader.tsx
@@ -393,12 +393,7 @@ export default class WalletHeader extends React.Component<
             <Header
                 leftComponent={
                     loading ? undefined : (
-                        <Row
-                            style={{
-                                flexGrow: 1,
-                                alignItems: 'center'
-                            }}
-                        >
+                        <Row>
                             <SettingsButton />
                             {paid && paid.length > 0 && (
                                 <TouchableOpacity
@@ -488,7 +483,7 @@ export default class WalletHeader extends React.Component<
                             <TempleButton navigation={navigation} />
                         </Row>
                     ) : channels ? (
-                        <Row>
+                        <Row style={{ marginTop: 1 }}>
                             <SearchButton />
                             <OpenChannelButton />
                         </Row>

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -342,6 +342,8 @@ PODS:
     - React-Core
   - react-native-notifications (5.1.0):
     - React-Core
+  - react-native-ping (1.2.8):
+    - React
   - react-native-print (0.11.0):
     - React-Core
   - react-native-randombytes (3.5.3):
@@ -565,6 +567,7 @@ DEPENDENCIES:
   - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
   - react-native-nfc-manager (from `../node_modules/react-native-nfc-manager`)
   - react-native-notifications (from `../node_modules/react-native-notifications`)
+  - react-native-ping (from `../node_modules/react-native-ping`)
   - react-native-print (from `../node_modules/react-native-print`)
   - react-native-randombytes (from `../node_modules/react-native-randombytes`)
   - react-native-restart (from `../node_modules/react-native-restart`)
@@ -683,6 +686,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-nfc-manager"
   react-native-notifications:
     :path: "../node_modules/react-native-notifications"
+  react-native-ping:
+    :path: "../node_modules/react-native-ping"
   react-native-print:
     :path: "../node_modules/react-native-print"
   react-native-randombytes:
@@ -765,14 +770,14 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
-  boost: 57d2868c099736d80fcd648bf211b4431e51a558
+  boost: 7dcd2de282d72e344012f7d6564d024930a6a440
   BVLinearGradient: 34a999fda29036898a09c6a6b728b0b4189e1a44
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
-  DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
+  DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
   FBLazyVector: f91d538f197fa71a7d5b77ec2069d49550c0eb96
   FBReactNativeSpec: b13d1c23d6ed82d6b66aad7a253edf8ba76c4a4c
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
+  glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
   hermes-engine: 90e4033deb00bee33330a9f15eff0f874bd82f6d
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   lottie-ios: 8f97d3271e155c2d688875c29cd3c74908aef5f8
@@ -802,6 +807,7 @@ SPEC CHECKSUMS:
   react-native-netinfo: fefd4e98d75cbdd6e85fc530f7111a8afdf2b0c5
   react-native-nfc-manager: 250424ac5f6b2827f98bec7a1ed7f27615852ed4
   react-native-notifications: 4601a5a8db4ced6ae7cfc43b44d35fe437ac50c4
+  react-native-ping: e9f64f02087c3cd2a0bc771ad0cf4a88edaa3072
   react-native-print: f704aef52d931bfce6d1d84351dbb5232d7ecb89
   react-native-randombytes: 3638d24759d67c68f6ccba60c52a7a8a8faa6a23
   react-native-restart: 7595693413fe3ca15893702f2c8306c62a708162

diff --git a/ios/zeus.xcodeproj/project.pbxproj b/ios/zeus.xcodeproj/project.pbxproj
@@ -1818,7 +1818,7 @@
 				CODE_SIGN_ENTITLEMENTS = zeus/zeus.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 3;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 9TU7M3555F;
 				ENABLE_BITCODE = NO;
@@ -1836,7 +1836,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.8.2;
+				MARKETING_VERSION = 0.8.3;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"-ObjC",
@@ -1867,7 +1867,7 @@
 				CODE_SIGN_ENTITLEMENTS = zeus/zeusRelease.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 3;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 9TU7M3555F;
 				ENABLE_BITCODE = NO;
@@ -1885,7 +1885,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.8.2;
+				MARKETING_VERSION = 0.8.3;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",

diff --git a/locales/ar.json b/locales/ar.json
@@ -527,7 +527,7 @@
     "views.PaymentRequest.isPmtHashSigValid": "Payment hash signature",
     "views.PaymentRequest.isRelaysSigValid": "Relays signature",
     "views.PaymentRequest.notAllowedToSend": "This wallet is not allowed to send funds!",
-    "views.Receive.title": "إستقبل",
+    "views.Receive.title": "استلام",
     "views.Receive.successCreate": "تم إنشاء فاتورة بنجاح",
     "views.Receive.warningLndHub": "Please note that LNDHub has a fixed on-chain address",
     "views.Receive.andSentTo": "و أُرسلت الى",
@@ -568,7 +568,7 @@
     "views.Receive.ampSwitchExplainer2": "Please note that AMP invoices are currently only compatible with LND nodes.",
     "views.Receive.lspZeroAmt": "The LSP is incompatible with zero amounts. An unwrapped invoice has been generated. Your node's public key will be exposed.",
     "views.Receive.createLightningAddress": "Create lightning address",
-    "views.Send.title": "أرسل",
+    "views.Send.title": "ارسال",
     "views.Send.rPreimage": "R Preimage",
     "views.Send.lnPayment": "Lightning payment request",
     "views.Send.btcAddress": "عنوان بيتكوين",
@@ -739,10 +739,12 @@
     "views.Settings.POS.Categories": "Categories",
     "views.Settings.POS.Category": "Product category",
     "views.Settings.POS.Category.name": "Category",
+    "views.Settings.POS.Category.noCategoriesDefined": "No categories defined yet",
     "views.Settings.POS.saveCategory": "Save category",
     "views.Settings.POS.Products": "Products",
     "views.Settings.POS.Product": "Product",
     "views.Settings.POS.Product.name": "Product name",
+    "views.Settings.POS.Product.noProductsDefined": "No products defined yet",
     "views.Settings.POS.Product.sku": "SKU",
     "views.Settings.POS.Product.price": "Price",
     "views.Settings.POS.Product.active": "نشط",
@@ -771,6 +773,7 @@
     "views.Settings.EmbeddedNode.NeutrinoPeers.dontAllowOtherPeers.subtitle": "Only connect to the peers specified. Enabling this may slow down block sync, but may be helpful if you're having issues broadcasting transactions.",
     "views.Settings.EmbeddedNode.NeutrinoPeers.allowingOtherPeers": "Allowing connections to other peers.",
     "views.Settings.EmbeddedNode.NeutrinoPeers.notAllowingOtherPeers": "Not allowing connections to other peers.",
+    "views.Settings.EmbeddedNode.NeutrinoPeers.timedOut": "Ping timed out",
     "views.Settings.EmbeddedNode.ZeroConfPeers.title": "Zero conf Peers",
     "views.Settings.EmbeddedNode.ZeroConfPeers.subtitle": "Set the peers you would like to accept zero conf lightning channels from, other than the LSP.",
     "views.Settings.EmbeddedNode.ExpressGraphSync.title": "Express Graph Sync",
@@ -867,8 +870,10 @@
     "views.Activity.noActivity": "No activity yet",
     "views.Activity.expired": "منتهي",
     "views.Activity.youSent": "انت ارسلت",
-    "views.Activity.youReceived": "انت استلمت",
+    "views.Activity.youReceived": "انت استلمت ",
+    "views.Activity.youReceivedAmp": "You received (AMP)",
     "views.Activity.requestedPayment": "طلب سداد",
+    "views.Activity.requestedPaymentAmp": "Requested Payment (AMP)",
     "views.Activity.expiredRequested": "Expired Request",
     "views.Activity.channelOperation": "Self send or Channel operation",
     "views.ActivityFilter.title": "Filter Activity",
@@ -881,6 +886,8 @@
     "views.ActivityFilter.minimumAmount": "Minimum Amount (sats)",
     "views.ActivityFilter.inTransit": "In transit payments",
     "views.ActivityFilter.isFailed": "Failed payments",
+    "views.ActivityFilter.standardInvoices": "Standard invoices",
+    "views.ActivityFilter.ampInvoices": "AMP invoices",
     "views.Routing.RoutingEvent.sourceChannel": "Source Channel",
     "views.Routing.RoutingEvent.destinationChannel": "Destination Channel",
     "views.Olympians.title": "Olympians",
@@ -937,7 +944,6 @@
     "pos.views.Wallet.PosPane.noOrdersStandalone": "No orders open at the moment",
     "pos.views.Wallet.PosPane.noOrdersPaid": "No orders have been paid yet",
     "pos.views.Wallet.PosPane.fetchingRates": "Fetching exchange rates",
-    "pos.views.Wallet.PosPane.noProducts": "No products have been created yet",
     "pos.views.Wallet.PosPane.uncategorized": "Uncategorized",
     "pos.views.Order.tax": "Tax",
     "pos.views.Order.subtotalBitcoin": "Subtotal (Bitcoin)",