Merge pull request #637 from ZeusLN/master

v0.6.0-alpha4

.eslintignore

@@ -0,0 +1,7 @@
+node_modules
+zeus_modules
+.eslintrc.js
+babel.config.js
+index.js
+metro.config.js
+shim.js

.eslintrc.js

@@ -1,6 +1,70 @@
 module.exports = {
   root: true,
-  extends: '@react-native-community',
-  comma-dangle: 0,
-  radix: 'as-needed',
+  parser: '@typescript-eslint/parser',
+  parserOptions: {
+    ecmaFeatures: { jsx: true },
+  },
+  env: {
+    browser: true,
+    amd: true,
+    node: true,
+  },
+  plugins: ['react', 'jest', 'import', 'prettier'],
+  settings: {
+    react: {
+      createClass: 'createReactClass',
+      pragma: 'React',
+      version: 'detect',
+      flowVersion: '0.53',
+    },
+    propWrapperFunctions: [
+      'forbidExtraProps',
+      { property: 'freeze', object: 'Object' },
+      { property: 'myFavoriteWrapper' },
+    ],
+    linkComponents: ['Hyperlink', { name: 'Link', linkAttribute: 'to' }],
+  },
+  extends: [
+    'eslint:recommended',
+    'prettier',
+    'plugin:@typescript-eslint/eslint-recommended',
+    'plugin:@typescript-eslint/recommended',
+    'plugin:import/errors',
+    'plugin:import/warnings',
+    'plugin:jest/recommended',
+    'plugin:prettier/recommended',
+    'plugin:react/recommended',
+  ],
+  rules: {
+    '@typescript-eslint/ban-ts-comment': 'off',
+    '@typescript-eslint/ban-types': 'off',
+    '@typescript-eslint/camelcase': 'off',
+    '@typescript-eslint/explicit-function-return-type': 'off',
+    '@typescript-eslint/explicit-module-boundary-types': 'off',
+    '@typescript-eslint/no-explicit-any': 'off',
+    '@typescript-eslint/no-non-null-assertion': 'off',
+    '@typescript-eslint/no-unused-vars': 0,
+    '@typescript-eslint/no-var-requires': 'off',
+    'import/default': 'off',
+    'import/named': 'off',
+    'import/namespace': 'off',
+    'import/no-named-as-default': 'off',
+    'import/no-named-as-default-member': 'off',
+    'import/no-unresolved': 'off',
+    'import/order': 2,
+    'react/no-string-refs': 'off',
+    'react/prop-types': 'off',
+    'react/react-in-jsx-scope': 'off',
+    'camelcase': 'off',
+    'no-case-declarations': 'off',
+    'no-control-regex': 'off',
+    'no-unused-vars': 0,
+    'prefer-spread': 'off',
+    'prettier/prettier': [
+      'error',
+      {
+        endOfLine: 'auto',
+      },
+    ],
+  },
 };

.github/PULL_REQUEST_TEMPLATE.md

@@ -14,8 +14,10 @@ This pull request is categorized as a:
 - [ ] Other
 
 ## Checklist
-- [ ] I’ve run `npm run tsc` and make sure my code didn’t produce errors 
-- [ ] I’ve run `npm run prettier` and formatted my code correctly
+- [ ] I’ve run `npm run tsc` and made sure my code compiles correctly
+- [ ] I’ve run `npm run lint` and made sure my code didn’t contain any problematic patterns
+- [ ] I’ve run `npm run prettier` and made sure my code is formatted correctly
+- [ ] I’ve run `npm run test` and made sure all of the tests pass
 
 ## Testing
 

.prettierrc

@@ -3,6 +3,5 @@
   "tabWidth": 4,
   "semi": true,
   "trailingComma": "none",
-  "bracketSpacing": true,
-  "jsxBracketSameLine": false
-}
+  "bracketSpacing": true
+}

App.tsx

@@ -1,8 +1,8 @@
 import * as React from 'react';
 import { View, StyleSheet } from 'react-native';
+import { Provider } from 'mobx-react';
 import Stores from './stores/Stores';
 import Navigation from './Navigation';
-import { Provider } from 'mobx-react';
 
 export default class App extends React.PureComponent {
     render() {

Navigation.ts

@@ -25,11 +25,18 @@ import NodeInfo from './views/NodeInfo';
 import Lockscreen from './views/Lockscreen';
 
 // Settings views
-import Settings from './views/Settings';
+import Settings from './views/Settings/Settings';
 import AddEditNode from './views/Settings/AddEditNode';
+import Nodes from './views/Settings/Nodes';
+import Privacy from './views/Settings/Privacy';
+import Security from './views/Settings/Security';
+import SetPassword from './views/Settings/SetPassword';
+import Language from './views/Settings/Language';
+import Currency from './views/Settings/Currency';
+import Theme from './views/Settings/Theme';
 import CertInstallInstructions from './views/Settings/CertInstallInstructions';
-import About from './views/Settings/About';
 import SignMessage from './views/Settings/SignMessage';
+import Help from './views/Settings/Help';
 
 // Routing
 import Routing from './views/Routing/Routing';
@@ -45,16 +52,20 @@ import Utxo from './views/UTXOs/UTXO';
 import ImportAccount from './views/Accounts/ImportAccount';
 import ImportAccountQRScanner from './views/Accounts/ImportAccountQRScanner';
 
-import Onboarding from './views/Onboarding';
+import Intro from './views/Intro';
+import IntroSplash from './views/IntroSplash';
 
 import EditFee from './views/EditFee';
 
 const AppScenes = {
     Lockscreen: {
         screen: Lockscreen
     },
-    Onboarding: {
-        screen: Onboarding
+    IntroSplash: {
+        screen: IntroSplash
+    },
+    Intro: {
+        screen: Intro
     },
     Wallet: {
         screen: Wallet
@@ -74,12 +85,33 @@ const AppScenes = {
     AddEditNode: {
         screen: AddEditNode
     },
+    Nodes: {
+        screen: Nodes
+    },
+    Privacy: {
+        screen: Privacy
+    },
+    Security: {
+        screen: Security
+    },
+    SetPassword: {
+        screen: SetPassword
+    },
+    Language: {
+        screen: Language
+    },
+    Currency: {
+        screen: Currency
+    },
+    Theme: {
+        screen: Theme
+    },
+    Help: {
+        screen: Help
+    },
     CertInstallInstructions: {
         screen: CertInstallInstructions
     },
-    About: {
-        screen: About
-    },
     SignMessage: {
         screen: SignMessage
     },

PGP.txt

@@ -1,52 +1,52 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-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
-HV/iDK0=
-=Uiyt
------END PGP PUBLIC KEY BLOCK-----
+mQINBGFwNm0BEAC+OQourKPuZx5kk4itFdAwoczQclQ//mCHycOG/UN7r2L74yp0
+wQi0+c053+yOOa4NpADx/Al4HajFvEqCh6Ywly6zIutL4A2yIwwj+ierNXeMt8s0
+hl0bBWm0sIDqR0rNUJVJxANrH6DK9x9M0RCoO79sKGALEBtSaoJ9nDjNch+eBX89
+mSpDauHbK0OUvM4VRQd8OK69mxt8Nrzb9S8F1rRqc9uVZkKeQDWLxKH0W0NTniga
+aKWBOQ8UWsTK9mHpGC/MMUv+iyiHUUEiYbCH9mKrHK5xNrqKcOWjigru9MI/wQl8
+qNIh8Lus08Bc0XvXmXX/Z/4ixCd+2GtmN7zLPfKSWrp1Ic2Wyziwgkekb9dD7MkQ
+KXZLj75Mp1yTXfssXnRvjeGkV2N63gAD6EiV5TzcAoMWKriQwv0UcNbhKalAnxMz
+oTXzWTeFjJEIVXFxY3CPcQDztv/AJNPCopm2cCsvwiAnVQqSTSSYWGdrjuYWWJfn
+jvl2sfM9r91lejEaXnKG2VvbWKRnRoiSrCmtn++e5VGrsdleNDYVddXuOLLyTd+8
+KYWEscWtWD4YTmHBLCGlU1JyqXp5IoxDY8krtCkrcAnn0aPMUqYhR5WKhatUTMJW
+gtKeVJPUxkS2Se7rTWaZ9dY0uMvRAF2AxmjXbkUuqriKdVi8sjZq+4cJJQARAQAB
+tB1aZXVzIExOIDx6ZXVzbG5AdHV0YW5vdGEuY29tPokCVAQTAQgAPhYhBJbCJSB/
+ITfieMMc96rEjeirje6EBQJhcDZtAhsDBQkDwmcABQsJCAcCBhUKCQgLAgQWAgMB
+Ah4BAheAAAoJEKrEjeirje6Eb+sQAL15AZBCzyn+xMeLahTYt88f7A3prOm8bpxf
+/rf7pKSvzS3tvaB6QUYVestEk3EMY5gMFrwp35hIS/cG1pPmucJK/39GPLh7BH3c
+VUmjs9VzPujGsiZsm3Iif9JHeJnf1+VZsczqFIchvr2qTBOHycxp1Hci4Y+jTpf5
+Qy66OXs/5qxU7k0ymj2b7ehNWcVaMArOqSQSEPUmI6lniVYNjf7hH048Uq8X79pk
+Fpd7HxtN25OXrBATAYLoIWbKRvVrEL1gTlaF6dtZt4CZ7D1CykoMngia8E7AiUZu
+fJMWJ0qkH6S/aUqeGju6l1JOOuxmZuI0sCpuM2kpmgloi2GPYFnyQ4n4FedALr/y
+jVAObK2ie1ED21ZF/Upl3T7TB7++B6+ngJw4eKfcAt79RVjERsEbf6w7Hiyefm+h
+822v6boFBNNqV/tPI6g78T59SGz6EtGKoSSqrSq/KA3I7Tv+vvloE2tZm1fiMtl4
+HEPNgA83FBdbogAK+opp1g3DeYusMO63tNenlL46ROyxiGmWIne2bIq1BSNSH28u
+BdDkuLLvtGkDPRdX3nBp3LqQ214ZR2cIMb2XjTIQVflIhnqkrhBiKiKFYIYPlV3K
+jEJoUblNdz5j5hhgL5xAfX1zSk4de1+TpRb4r+7tUtMbL7a7LDm78sYD9Ri8/AeR
+79RNtp6OuQINBGFwNm0BEAC9P8CjjHMx/3oSc6k+lqg+tvOQS1XR5bBh2vLM8zAr
+rV6UNOGNJi07zQVj8wQwa5NdVSka2dusXOCA1fyeCputcRRzzC00U6+nbYNoSZrR
+2GuvNA+HTbRQT8QV71yNTK8jogmeawR7yEqzJyLsX8kQ+L3Gsa5wXqNQK/FFNc5r
+krUn/SaK8f65dZL3y9L7QY1/sReD9R7vuI2/mgxm9cGeo6uCo+vyZWzVz+DRgpSs
+aqb5HIwETP1k7dvGXQBLlK51qHbEaEU3zvyxRn96DrYcAIPXM0WEm0fz8iuhpq/L
+fwb3VDrHUESKAyPFjduOK2zicNui+/lWV+nSnol8lfqUWhrxieTRYy3yOPKl3gje
+C8p/ctrtGD0qp7xfFMzjfneSSZrC7QqhccJHlznSNyOFjfF7OJzRnLJoi5MTI9nK
+escoemfgucjQarCUwKtnz7IbaVn3BU1C+wXM0jHnUnw+hJ2p1rGbcOaklS/pY21w
+eJ3fWx7UCVsugDOwDw7QGu9M7GcShmGt/XJIkI+vpCzgtt1hMRsN66THfuiE83mK
+AY9U9FEn/LEYFrsxslVU9685OQTlE/Dm2Vc+Iqd2O8dXbfazXqdtgQe+Gfd0USLQ
+NBpiJ8lBrL1+o3IVOtAC9lzk51rrZJy1UGdUcf6zIhT+Iq8Sz2GNC4g28WCANO3k
+0wARAQABiQI8BBgBCAAmFiEElsIlIH8hN+J4wxz3qsSN6KuN7oQFAmFwNm0CGwwF
+CQPCZwAACgkQqsSN6KuN7oQdjA/+LkJ+Q/NakXiSArPg+bRsyRXh34c93lqaDnVO
+t4PApW5ioD6fSES58Ooh9uqBlm42EMwIgP2OmevBicx8bF1YZ1DDZrYPPp2+zjDs
+DK6vcf/Y0Bs2ToxxI4uIYuPa98M9SOTk4o78MrriuPsFIKu2lc4KdGnlfNPlSjYo
+aOYw1ZRL9hnLasSNK6aHPpDir7pyt9y+C9qBXZ8eJOxm/m0RFe76VbYhNMX2vuKn
+Y8T/F3ZDWMJoadBFNqDScNT6/5WDnrtjQHrEnp7P2FUatnEvC2d5Kg/eHAWi9W7N
+FsB3Hug1S7zL8wnw1Eq9QJ+b1eG3lRTjRQNgzvFIXLJeV/pQUkLnH0Y5//wJIWsg
+r0I+L9aKIr6cTfGSViBmhLxMKwqDIpVlHAzuBDETANHwhUaxp73N+QFi8FNwx30Y
+fQZ9ggRazYPS8S3x5XaExtT5DkOLebOJ+3K1w8xaJ7u7XspjuhKr1JrZ2z/hKkvb
+EXDNmGNH0xttl1ikS/LUOVVJTMhqsTitZvkwz9xbCMwKYUxNZc6qsBkk/9eFqrhB
+LkTZkkde7rb9CKJ5XUQUJhsmrsx4TQs3h9wyZ+LEiw+Lzk0OE/wg5qQK1zY94R+4
+8H636yBYqCMqO4vW3nxjYd7nz1Urs8vIf+vxLa9FZ63j9aXCL5GH21aD4U9F7i5L
+1QVktEI=
+=axW5
+-----END PGP PUBLIC KEY BLOCK-----

README.md

@@ -1,12 +1,10 @@
 # Zeus
-A mobile Bitcoin/Lightning app for lnd, c-lightning, and Eclair node operators ⚡️
+<p align="center"><img src="https://user-images.githubusercontent.com/55287964/141266539-cf35be24-5f89-4798-94bc-ded5cd761b70.png"></p>
 
-<p align="center"><img src="https://user-images.githubusercontent.com/47701173/129115625-3e4f94d0-935a-45aa-9916-60bd5c27af34.png"></p>
+Zeus is a mobile Bitcoin/Lightning node manager and wallet application for lnd, c-lightning, and Eclair. ⚡️
 
 Zeus is built on TypeScript and React-Native. It runs on both iOS and Android.
 
-*Disclaimer*: Zeus and Lightning in general are software projects in their early development stages. Please be wary when using Lightning and do not fund your node with more money than you are willing to lose.
-
 ### App Store links
 * [Google Play](https://play.google.com/store/apps/details?id=app.zeusln.zeus)
 * [Apple App Store](https://apps.apple.com/us/app/zeus-ln/id1456038895)
@@ -20,14 +18,43 @@ Zeus is built on TypeScript and React-Native. It runs on both iOS and Android.
 * Keep up with us on
 [Twitter](https://twitter.com/ZeusLN)
 * Open a channel with
-[our main node](https://1ml.com/node/03e1210c8d4b236a53191bb172701d76ec06dfa869a1afffcfd8f4e07d9129d898)
-or
-[our Olympus node](https://1ml.com/node/02c2d8e5f8220c99d92f4fe808e7c5332d33d146db3e63a50f03663addfaa5a8df)
-
-## Connecting to your node
-
-Currently, to use Zeus, you must have a Bitcoin Lightning node running
-[Lightning Network Daemon (lnd)](https://github.com/LightningNetwork/lnd), [eclair](https://github.com/ACINQ/eclair), or [c-lightning](https://github.com/ElementsProject/lightning) using the [c-lightning-REST](https://github.com/Ride-The-Lightning/c-lightning-REST/) or [Spark](https://github.com/shesek/spark-wallet#server-installation) API .
+[our node](https://amboss.space/node/031b301307574bbe9b9ac7b79cbe1700e31e544513eae0b5d7497483083f99e581)
+
+## Features
+
+- [x] Connect to lnd node
+- [x] Connect to c-lightning REST + Spark node
+- [x] Connect to Eclair node
+- [x] Connect via LNDHub
+- [x] Manage multiple nodes at once
+- [x] Receive and send On-chain transfers
+- [x] Receive and send Lighting payments
+- [x] Lighting channel management
+- [x] Detailed routing reports
+- [x] Set and manage routing fees
+- [x] Combined On-chain / Lightning activity menu
+- [x] Connect over Tor on Android (no Orbot) and iOS
+- [x] Lightning channel selection
+- [x] MPP/AMP support
+- [x] lnaddress send support
+- [x] Keysend support
+- [x] LNURL-Pay
+- [x] LNURL-Withdraw
+- [x] LNURL-Auth
+- [x] LNURL-Channel
+- [x] Passphrase security
+- [x] Hide sensitive data mode
+- [x] Fiat currency integrations
+- [x] [Various language support](https://www.transifex.com/ZeusLN/zeus/)
+- [ ] On-chain coin control (redesign)
+- [ ] PIN security (redesign)
+- [ ] Sign and verify message (redesign)
+- [ ] External signer support (redesign)
+- [ ] Contact list for easier payments
+
+## Connecting Zeus to your node
+
+Currently, to use Zeus, you must have a Bitcoin Lightning node running [Lightning Network Daemon (lnd)](https://github.com/LightningNetwork/lnd), [eclair](https://github.com/ACINQ/eclair), or [c-lightning](https://github.com/ElementsProject/lightning) using the [c-lightning-REST](https://github.com/Ride-The-Lightning/c-lightning-REST/) or [Spark](https://github.com/shesek/spark-wallet#server-installation) API.
 
 You must provide Zeus with your node's hostname, port number, and the macaroon you choose to use in **hex format**. If you need help converting your macaroon to hex format we wrote up a Node.js script that can use
 [here](https://github.com/ZeusLN/lnd-hex-macaroon-generator/). Alternatively, if you're running a Unix-based operating system (eg. macOS, Linux) you can run `xxd -ps -u -c 1000 /path/to/admin.macaroon` to generate your macaroon in hex format.
@@ -78,10 +105,6 @@ Zeus is proud to be integrated on the following platforms:
 3. `cd ios && pod install`
 4. open `ios/zeus.xcworkspace` in Xcode and hit Run
 
-## Google Play Releases
-
-Google Play releases aren't fully featured due to Google policies. To get the fully featured version of Zeus on Android you must download the APK from the [Zeus website](https://zeusln.app), GitHub, or F-Droid. Google Play releases are managed on the `play-releases` branch. Commits used for Google Play builds will be marked in the release notes.
-
 ## Contributing
 
 Please be sure to run `npm run tsc` to check for type errors, `npm run test` to run all tests, and `npm run prettier` to run the prettier
@@ -95,13 +118,15 @@ Do not directly modify the files in `/locales` unless you are adding new copy to
 
 ## Release + Commit Verification
 
-All releases and all maintainer commits as of January 24, 2020 are signed by key `989CC718EBA8BB68` ([email protected]). The key can be found [in this repo](https://github.com/ZeusLN/zeus/blob/master/PGP.txt) and [on the ZeusLN.app website](https://zeusln.app/PGP.txt).
+All releases and all maintainer commits as of October 20, 2021 are signed by key `AAC48DE8AB8DEE84` ([email protected]). The key can be found [in this repo](https://github.com/ZeusLN/zeus/blob/master/PGP.txt) and [on the ZeusLN.app website](https://zeusln.app/PGP.txt).
 
-## Donations
 
-If you'd like to help us with the cost of running Zeus project (iOS developer account, Google Play developer account, hosting) you can send a payment to us via PayNym
-[+holymorning7d1](http://my.paynym.is/+holymorning7d1), via [tippin.me](https://tippin.me/@ZeusLN), or via keysend. Our node can be found at ```03e1210c8d4b236a53191bb172701d76ec06dfa869a1afffcfd8f4e07d9129d898@zg6ziy65wqhiczqfqupx26j5yjot5iuxftqtiyvika3xoydc5hx2mtyd.onion:9735```.
+### Past Keys
+`989CC718EBA8BB68` (January 24, 2020 - October 19, 2021)
+
+## Donations
 
+If you'd like to help us with the cost of running Zeus project (iOS developer account, Google Play developer account, hosting) you can send a payment to us via our [BTCPayServer portal](https://pay.zeusln.app/apps/4JiSAsU4SsHyoM9z5FjqAoA2eRZb/pos), via Lightning Address ([email protected]), or via PayNym ([+holymorning7d1](http://my.paynym.is/+holymorning7d1)).
 Thank you.
 
 ## License