Merge pull request ZeusLN#1023 from ZeusLN/master

[Releases] v0.6.5-rc2

Author: kaloudis

Navigation.ts

@@ -19,6 +19,7 @@ import Channel from './views/Channels/Channel';
 import Payment from './views/Payment';
 import Invoice from './views/Invoice';
 import BTCPayConfigQRScanner from './views/BTCPayConfigQRScanner';
+import CLightningRestQRScanner from './views/CLightningRestQRScanner';
 import LNDConnectConfigQRScanner from './views/LNDConnectConfigQRScanner';
 import LNDHubQRScanner from './views/LNDHubQRScanner';
 import SparkQRScanner from './views/SparkQRScanner';
@@ -42,7 +43,10 @@ import CertInstallInstructions from './views/Settings/CertInstallInstructions';
 import SignVerifyMessage from './views/Settings/SignVerifyMessage';
 import About from './views/Settings/About';
 import Help from './views/Settings/Help';
+import Sponsors from './views/Settings/Sponsors';
 import Olympians from './views/Settings/Olympians';
+import Gods from './views/Settings/Gods';
+import Mortals from './views/Settings/Mortals';
 
 // Routing
 import Routing from './views/Routing/Routing';
@@ -123,9 +127,18 @@ const AppScenes = {
     Help: {
         screen: Help
     },
+    Sponsors: {
+        screen: Sponsors
+    },
     Olympians: {
         screen: Olympians
     },
+    Gods: {
+        screen: Gods
+    },
+    Mortals: {
+        screen: Mortals
+    },
     CertInstallInstructions: {
         screen: CertInstallInstructions
     },
@@ -207,6 +220,9 @@ const AppScenes = {
     LNDConnectConfigQRScanner: {
         screen: LNDConnectConfigQRScanner
     },
+    CLightningRestQRScanner: {
+        screen: CLightningRestQRScanner
+    },
     LNDHubQRScanner: {
         screen: LNDHubQRScanner
     },

android/app/build.gradle

@@ -131,7 +131,7 @@ android {
         applicationId "app.zeusln.zeus"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 41
+        versionCode 42
         versionName "0.6.5"
         multiDexEnabled true
         missingDimensionStrategy 'react-native-camera', 'general'

components/CollapsedQR.tsx

@@ -108,8 +108,7 @@ export default class CollapsedQR extends React.Component<
                     icon={{
                         name: 'qrcode',
                         type: 'font-awesome',
-                        size: 25,
-                        color: '#fff'
+                        size: 25
                     }}
                     containerStyle={{
                         margin: 10

ios/zeus.xcodeproj/project.pbxproj

@@ -1612,7 +1612,7 @@
 				CODE_SIGN_ENTITLEMENTS = zeus/zeus.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 7;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = 7222UU8F2H;
 				ENABLE_BITCODE = NO;
@@ -1651,8 +1651,8 @@
 				CODE_SIGN_ENTITLEMENTS = zeus/zeusRelease.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
-				DEVELOPMENT_TEAM = "";
+				CURRENT_PROJECT_VERSION = 7;
+				DEVELOPMENT_TEAM = 7222UU8F2H;
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",

locales/ar.json

@@ -453,6 +453,9 @@
     "views.Routing.RoutingEvent.destinationChannel": "Destination Channel",
     "views.Olympians.title": "Olympians",
     "views.Olympians.becomeASponsor": "Become a community sponsor",
+    "views.Sponsors.title": "Sponsors",
+    "views.Gods.title": "Gods",
+    "views.Mortals.title": "Mortals",
     "components.UTXOPicker.modal.title": "Select UTXOs to use",
     "components.UTXOPicker.modal.description": "Select the UTXOs to be used in this operation. You may want to only use specific UTXOs to preserve your privacy.",
     "components.UTXOPicker.modal.set": "Set UTXOs",

locales/cs.json

@@ -453,6 +453,9 @@
     "views.Routing.RoutingEvent.destinationChannel": "Cílový kanál",
     "views.Olympians.title": "Olympijci",
     "views.Olympians.becomeASponsor": "Staňte se sponzorem komunity",
+    "views.Sponsors.title": "Sponsors",
+    "views.Gods.title": "Gods",
+    "views.Mortals.title": "Mortals",
     "components.UTXOPicker.modal.title": "Vyberte UTXO, které chcete použít",
     "components.UTXOPicker.modal.description": "Vyberte UTXO, které se mají použít v této operaci. Možná budete chtít používat pouze konkrétní UTXO k ochraně vašeho soukromí.",
     "components.UTXOPicker.modal.set": "Nastavit UTXO",

locales/de.json

@@ -115,7 +115,7 @@
     "views.Settings.AddEditNode.scanLndconnect": "Lndconnect Config scannen",
     "views.Settings.AddEditNode.scanBtcpay": "BTCPay Config scannen",
     "views.Settings.AddEditNode.scanLndhub": "LNDHub QR-Code scannen",
-    "views.Settings.AddEditNode.scanSpark": "Scan Spark QR",
+    "views.Settings.AddEditNode.scanSpark": "Scanne einen Spark QR",
     "views.Settings.AddEditNode.deleteNode": "Node config entfernen",
     "views.Settings.AddEditNode.copyNode": "Kopiere Node-Konfiguration",
     "views.Settings.AddEditNode.nodeInterface": "Node-Schittstelle",
@@ -133,8 +133,8 @@
     "views.Settings.Security.deletePIN": "Lösche PIN",
     "views.Settings.Security.deleteDuressPIN": "Lösche Bedrohungs-PIN",
     "views.Settings.Security.scramblePIN": "PIN-Nummern verschlüsseln",
-    "views.SparkQRScanner.text": "Scan a Spark QR code",
-    "views.SparkQRScanner.error": "Error fetching Spark config",
+    "views.SparkQRScanner.text": "Scanne einen Spark QR Code",
+    "views.SparkQRScanner.error": "Fehler beim abrufen der Spark Konfiguration",
     "views.ImportAccount.title": "Konto importieren",
     "views.ImportAccount.name": "Kontobezeichnung",
     "views.ImportAccount.extendedPubKey": "Extended Public Key (Xpub)",
@@ -143,7 +143,7 @@
     "views.Wallet.Channels.open": "Kanal öffnen",
     "views.Wallet.Channels.inactive": "INAKTIV",
     "views.Wallet.Channels.private": "Privat",
-    "views.OpenChannel.announceChannel": "Announce channel",
+    "views.OpenChannel.announceChannel": "Kanal angekündigt",
     "views.Wallet.Channels.local": "Lokal",
     "views.Wallet.Channels.remote": "Entfernt",
     "views.Wallet.Channels.noChannels": "Keine Channels",
@@ -324,14 +324,14 @@
     "views.Receive.ampInvoice": "AMP Rechnung",
     "views.Receive.routeHints": "Routenhinweise hinzufügen",
     "views.Receive.youReceived": "Empfangen",
-    "views.Receive.addressType": "Choose address type",
-    "views.Receive.p2wkhKey": "SegWit (P2WKH)",
-    "views.Receive.p2wkhDescription": "A more modern address type that saves on fees for incoming and outgoing payments.",
-    "views.Receive.np2wkhKey": "Nested SegWit (NP2WKH)",
-    "views.Receive.np2wkhDescription": "Use only when a service labels your SegWit or Taproot address as invalid.",
-    "views.Receive.np2wkhDescriptionAlt": "Use only when a service labels your SegWit address as invalid.",
+    "views.Receive.addressType": "Wähle den Adress-Typen",
+    "views.Receive.p2wkhKey": "SegWit (P2WHKH)",
+    "views.Receive.p2wkhDescription": "Ein modernerer Adress-Typ der Gebühren bei Ein- und Auszahlungen spart.",
+    "views.Receive.np2wkhKey": "Verschachteltes SegWit (NP2WKH)",
+    "views.Receive.np2wkhDescription": "Nur verwenden, wenn ein Dienst Ihre SegWit- oder Taproot-Adresse als ungültig kennzeichnet.",
+    "views.Receive.np2wkhDescriptionAlt": "Nur verwenden, wenn ein Dienst Ihre SegWit-Adresse als ungültig kennzeichnet.",
     "views.Receive.p2trKey": "Taproot (P2TR)",
-    "views.Receive.p2trDescription": "The latest, most powerful, bitcoin address type. Not widely supported.",
+    "views.Receive.p2trDescription": "Der neueste und leistungsstärkste Bitcoin-Adresstyp. Nicht überall unterstützt.",
     "views.Send.title": "senden ",
     "views.Send.lnPayment": "Lightning Bezahlanfrage",
     "views.Send.btcAddress": "Bitcoin-Adresse",
@@ -453,6 +453,9 @@
     "views.Routing.RoutingEvent.destinationChannel": "Zielkanal",
     "views.Olympians.title": "Olympioniken",
     "views.Olympians.becomeASponsor": "Werde Community-Sponsor",
+    "views.Sponsors.title": "Sponsors",
+    "views.Gods.title": "Gods",
+    "views.Mortals.title": "Mortals",
     "components.UTXOPicker.modal.title": "Zu benutzende UTXOs auswählen",
     "components.UTXOPicker.modal.description": "UTXOs auswählen, die bei dieser Operation verwendet werden sollen. Sie sollten nur ausgewählte UTXOs verwenden, um ihre Privatsphäre zu schützen.",
     "components.UTXOPicker.modal.set": "UTXOs festlegen",
@@ -462,10 +465,10 @@
     "backends.LND.wsReq.warning": "Möglicherweise muss die Zertifikatsprüfung aktiviert werden, um diese Art von Anrufen zu tätigen",
     "utils.handleAnything.lightningAddressError": "Fehler beim Abrufen der Lightning-Adressdaten ",
     "utils.handleAnything.notValid": "Der bereitgestellte Wert war eine ungültige Bitcoin-Adresse oder Lightning-Rechnung",
-    "utils.handleAnything.lnurlAuthNotSupported": "LnurlAuth not supported by your node implementation",
-    "utils.handleAnything.unsupportedLnurlType": "Unsupported lnurl type",
+    "utils.handleAnything.lnurlAuthNotSupported": "LnurlAuth wird von der Implementierung Ihres  Knotens nicht unterstützt",
+    "utils.handleAnything.unsupportedLnurlType": "Nicht unterstützter lnurl Typ",
     "stores.InvoicesStore.errorCreatingInvoice": "Fehler beim Erstellen der Rechnung",
-    "stores.InvoicesStore.errorGeneratingAddress": "Error generating new address",
+    "stores.InvoicesStore.errorGeneratingAddress": "Fehler beim generieren der neuen Adresse",
     "stores.SettingsStore.btcPayImplementationSupport": "Leider unterstützen wir derzeit nur BTCPay-Instanzen mit lnd oder c-lightning",
     "stores.SettingsStore.btcPayFetchConfigError": "Fehler beim Abrufen der BTCPay-Konfiguration",
     "stores.SettingsStore.olympianFetchError": "Fehler beim Laden der Olympioniken",

locales/el.json

@@ -453,6 +453,9 @@
     "views.Routing.RoutingEvent.destinationChannel": "Destination Channel",
     "views.Olympians.title": "Olympians",
     "views.Olympians.becomeASponsor": "Become a community sponsor",
+    "views.Sponsors.title": "Sponsors",
+    "views.Gods.title": "Gods",
+    "views.Mortals.title": "Mortals",
     "components.UTXOPicker.modal.title": "Επέλεξε UTXOs που θα χρησιμοποιηθούν",
     "components.UTXOPicker.modal.description": "Select the UTXOs to be used in this operation. You may want to only use specific UTXOs to preserve your privacy.",
     "components.UTXOPicker.modal.set": "Set UTXOs",

locales/en.json

@@ -67,6 +67,7 @@
     "models.Invoice.never": "Never",
     "models.Payment.forwarded": "Forwarded",
     "models.Payment.fee": "Fee",
+    "views.CLightningRestQRScanner.error": "Error fetching c-lightning-REST config",
     "views.LnurlPay.LnurlPay.amount": "Amount to pay (in Satoshis)",
     "views.LnurlPay.LnurlPay.comment": "Comment",
     "views.LnurlPay.LnurlPay.invalidParams": "Invalid lnurl params!",
@@ -113,6 +114,7 @@
     "views.Settings.AddEditNode.setNodeActive": "Set Node Config as Active",
     "views.Settings.AddEditNode.nodeActive": "Node Active",
     "views.Settings.AddEditNode.scanLndconnect": "Scan lndconnect config",
+    "views.Settings.AddEditNode.scanCLightningRest": "Scan c-lightning-REST QR",
     "views.Settings.AddEditNode.scanBtcpay": "Scan BTCPay config",
     "views.Settings.AddEditNode.scanLndhub": "Scan LNDHub QR",
     "views.Settings.AddEditNode.scanSpark": "Scan Spark QR",
@@ -453,6 +455,9 @@
     "views.Routing.RoutingEvent.destinationChannel": "Destination Channel",
     "views.Olympians.title": "Olympians",
     "views.Olympians.becomeASponsor": "Become a community sponsor",
+    "views.Sponsors.title": "Sponsors",
+    "views.Gods.title": "Gods",
+    "views.Mortals.title": "Mortals",
     "components.UTXOPicker.modal.title": "Select UTXOs to use",
     "components.UTXOPicker.modal.description": "Select the UTXOs to be used in this operation. You may want to only use specific UTXOs to preserve your privacy.",
     "components.UTXOPicker.modal.set": "Set UTXOs",

locales/es.json

@@ -453,6 +453,9 @@
     "views.Routing.RoutingEvent.destinationChannel": "Canal de Destino",
     "views.Olympians.title": "Olympians",
     "views.Olympians.becomeASponsor": "Become a community sponsor",
+    "views.Sponsors.title": "Sponsors",
+    "views.Gods.title": "Gods",
+    "views.Mortals.title": "Mortals",
     "components.UTXOPicker.modal.title": "Seleccionar UTXOs para usar",
     "components.UTXOPicker.modal.description": "Seleccione las UTXOs que se utilizarán en esta operación. Es posible que desee utilizar solo un UTXO específico para preservar su privacidad.",
     "components.UTXOPicker.modal.set": "Conjunto de UTXOs",