created OnChainAddresses screen

ZeusLN · Aug 14, 2024 · bd7e3ca · bd7e3ca
1 parent f2603c4
commit bd7e3ca
Show file tree

Hide file tree

Showing 13 changed files with 537 additions and 44 deletions.
diff --git a/App.tsx b/App.tsx
@@ -34,6 +34,7 @@ import Payment from './views/Payment';
 import PaymentPaths from './views/PaymentPaths';
 import Invoice from './views/Invoice';
 import Sweep from './views/Sweep';
+import OnChainAddresses from './views/OnChainAddresses';
 
 import SparkQRScanner from './views/SparkQRScanner';
 import NodeInfo from './views/NodeInfo';
@@ -868,6 +869,12 @@ export default class App extends React.PureComponent {
                                                         name="PendingHTLCs"
                                                         component={PendingHTLCs}
                                                     />
+                                                    <Stack.Screen
+                                                        name="OnChainAddresses"
+                                                        component={
+                                                            OnChainAddresses
+                                                        }
+                                                    />
                                                 </Stack.Navigator>
                                             </NavigationContainer>
                                         </>

diff --git a/assets/images/SVG/on-chain_addresses.svg b/assets/images/SVG/on-chain_addresses.svg
diff --git a/backends/LND.ts b/backends/LND.ts
@@ -555,6 +555,7 @@ export default class LND {
     getUTXOs = (data: any) => this.postRequest('/v2/wallet/utxos', data);
     bumpFee = (data: any) => this.postRequest('/v2/wallet/bumpfee', data);
     listAccounts = () => this.getRequest('/v2/wallet/accounts');
+    listAddresses = () => this.getRequest('/v2/wallet/addresses');
     importAccount = (data: any) =>
         this.postRequest('/v2/wallet/accounts/import', data);
     signMessage = (message: string) =>
@@ -672,5 +673,6 @@ export default class LND {
     supportsLSPS1customMessage = () => true;
     supportsLSPS1rest = () => false;
     supportsOffers = (): Promise<boolean> | boolean => false;
+    supportsAddressesWithDerivationPaths = () => this.supports('v0.18.0');
     isLNDBased = () => true;
 }
diff --git a/components/DropdownSetting.tsx b/components/DropdownSetting.tsx
@@ -46,9 +46,9 @@ export default class DropdownSetting extends React.Component<
             }
         );
 
-        const displayItem = values.filter(
+        const displayItem = values.find(
             (value: any) => value.value === selectedValue
-        )[0];
+        );
 
         const display = displayItem ? displayItem.key : null;
 

diff --git a/locales/en.json b/locales/en.json
@@ -118,6 +118,9 @@
     "general.used": "Used",
     "general.unused": "Unused",
     "general.discountCode": "Discount code",
+    "general.accountName": "Account name",
+    "general.addressType": "Address type",
+    "general.sorting": "Sorting",
     "restart.title": "Restart required",
     "restart.msg": "ZEUS has to be restarted before the new configuration is applied.",
     "restart.msg1": "Would you like to restart now?",
@@ -277,10 +280,8 @@
     "views.SparkQRScanner.text": "Scan a Spark QR code",
     "views.SparkQRScanner.error": "Error fetching Spark config",
     "views.ImportAccount.title": "Import account",
-    "views.ImportAccount.name": "Account name",
     "views.ImportAccount.extendedPubKey": "Extended Public Key (xpub, zpub, tpub, etc.)",
     "views.ImportAccount.masterKeyFingerprint": "Master Key Fingerprint",
-    "views.ImportAccount.addressType": "Address type",
     "views.ImportAccount.importAccount": "Import Account",
     "views.ImportAccount.note": "NOTE: Events (deposits/spends) for keys derived from an account will only be detected by LND if they happen after the import. Rescans to detect past events will be supported later on.",
     "views.ImportAccount.derivationPath": "Derivation Path",
@@ -1232,5 +1233,15 @@
     "views.PendingHTLCs.outgoing": "Outgoing",
     "views.PendingHTLCs.expirationHeight": "Expiration height",
     "views.PendingHTLCs.recommendationIOS": "It's recommended to leave ZEUS running while there are pending HTLCs to prevent force closes.",
-    "views.PendingHTLCs.recommendationAndroid": "It's recommended to enable Persistent LND or leave ZEUS running while there are pending HTLCs to prevent force closes."
+    "views.PendingHTLCs.recommendationAndroid": "It's recommended to enable Persistent LND or leave ZEUS running while there are pending HTLCs to prevent force closes.",
+    "views.OnChainAddresses.title": "On-chain addresses",
+    "views.OnChainAddresses.noAddressesAvailable": "No addresses available",
+    "views.OnChainAddresses.hideZeroBalanance": "Hide 0-balance",
+    "views.OnChainAddresses.hideChangeAddresses": "Hide change addresses",
+    "views.OnChainAddresses.sortBy.creationTimeAscending": "Creation time (ascending)",
+    "views.OnChainAddresses.sortBy.creationTimeDescending": "Creation time (descending)",
+    "views.OnChainAddresses.sortBy.balanceAscending": "Balance (ascending)",
+    "views.OnChainAddresses.sortBy.balanceDescending": "Balance (descending)",
+    "views.OnChainAddresses.createAddress": "Create address",
+    "views.OnChainAddresses.changeAddresses": "Change addresses"
 }
diff --git a/package.json b/package.json
@@ -170,8 +170,8 @@
     "@types/lodash": "4.14.198",
     "@types/object-hash": "1.3.4",
     "@types/pako": "2.0.3",
-    "@types/react": "18.0.38",
-    "@types/react-native": "0.70.6",
+    "@types/react": "18.2.21",
+    "@types/react-native": "0.73.0",
     "@types/react-native-vector-icons": "6.4.14",
     "@types/react-test-renderer": "18.0.2",
     "@types/sha.js": "2.4.1",
@@ -198,6 +198,9 @@
     "rn-nodeify": "10.3.0",
     "typescript": "4.8.4"
   },
+  "resolutions": {
+    "@types/react": "18.2.21"
+  },
   "react-native": {
     "zlib": "browserify-zlib",
     "console": "console-browserify",

diff --git a/utils/BackendUtils.ts b/utils/BackendUtils.ts
@@ -106,6 +106,7 @@ class BackendUtils {
     getUTXOs = (...args: any[]) => this.call('getUTXOs', args);
     listAccounts = (...args: any[]) => this.call('listAccounts', args);
     importAccount = (...args: any[]) => this.call('importAccount', args);
+    listAddresses = (...args: any[]) => this.call('listAddresses', args);
     signMessage = (...args: any[]) => this.call('signMessage', args);
     verifyMessage = (...args: any[]) => this.call('verifyMessage', args);
     lnurlAuth = (...args: any[]) => this.call('lnurlAuth', args);
@@ -169,6 +170,8 @@ class BackendUtils {
     supportsOnchainBatching = () => this.call('supportsOnchainBatching');
     supportsChannelBatching = () => this.call('supportsChannelBatching');
     supportsOffers = () => this.call('supportsOffers');
+    supportsAddressesWithDerivationPaths = () =>
+        this.call('supportsAddressesWithDerivationPaths');
     isLNDBased = () => this.call('isLNDBased');
 
     // LNC

diff --git a/views/Accounts/ImportAccount.tsx b/views/Accounts/ImportAccount.tsx
@@ -226,7 +226,7 @@ export default class ImportAccount extends React.Component<
                                 color: themeColor('secondaryText')
                             }}
                         >
-                            {localeString('views.ImportAccount.name')}
+                            {localeString('general.accountName')}
                         </Text>
                         <TextInput
                             placeholder={'My airgapped hardware wallet'}
@@ -281,9 +281,7 @@ export default class ImportAccount extends React.Component<
                             />
                         </>
                         <DropdownSetting
-                            title={localeString(
-                                'views.ImportAccount.addressType'
-                            )}
+                            title={localeString('general.addressType')}
                             selectedValue={walletrpc.AddressType[address_type]}
                             onValueChange={async (value: string) => {
                                 this.setState({

diff --git a/views/Accounts/ImportingAccount.tsx b/views/Accounts/ImportingAccount.tsx
@@ -66,7 +66,7 @@ export default class ImportingAccount extends React.Component<
                         />
                     )}
                     <KeyValue
-                        keyValue={localeString('views.ImportAccount.name')}
+                        keyValue={localeString('general.accountName')}
                         value={name}
                     />
 
@@ -89,9 +89,7 @@ export default class ImportingAccount extends React.Component<
                     )}
 
                     <KeyValue
-                        keyValue={localeString(
-                            'views.ImportAccount.addressType'
-                        )}
+                        keyValue={localeString('general.addressType')}
                         value={
                             walletrpc.AddressType[address_type] || address_type
                         }

diff --git a/views/Menu.tsx b/views/Menu.tsx
@@ -28,6 +28,7 @@ import NostrichIcon from '../assets/images/SVG/Nostrich.svg';
 import ReceiveIcon from '../assets/images/SVG/Receive.svg';
 import RoutingIcon from '../assets/images/SVG/Routing.svg';
 import WrenchIcon from '../assets/images/SVG/Wrench.svg';
+import OnChainAddressesIcon from '../assets/images/SVG/on-chain_addresses.svg';
 
 import Header from '../components/Header';
 import NodeIdenticon, { NodeTitle } from '../components/NodeIdenticon';
@@ -469,6 +470,51 @@ export default class Menu extends React.Component<MenuProps, MenuState> {
                             </View>
                         )}
 
+                    {BackendUtils.supportsAddressesWithDerivationPaths() && (
+                        <View
+                            style={{
+                                backgroundColor: themeColor('secondary'),
+                                width: '90%',
+                                borderRadius: 10,
+                                alignSelf: 'center',
+                                marginVertical: 5
+                            }}
+                        >
+                            <TouchableOpacity
+                                onPress={() =>
+                                    navigation.navigate('OnChainAddresses')
+                                }
+                            >
+                                <View style={styles.columnField}>
+                                    <View style={styles.icon}>
+                                        <OnChainAddressesIcon
+                                            fill={themeColor('text')}
+                                            stroke={themeColor('text')}
+                                            color={themeColor('text')}
+                                            height={22}
+                                            width={22}
+                                        />
+                                    </View>
+                                    <Text
+                                        style={{
+                                            ...styles.columnText,
+                                            color: themeColor('text')
+                                        }}
+                                    >
+                                        {localeString(
+                                            'views.OnChainAddresses.title'
+                                        )}
+                                    </Text>
+                                    <View style={styles.ForwardArrow}>
+                                        <ForwardIcon
+                                            stroke={forwardArrowColor}
+                                        />
+                                    </View>
+                                </View>
+                            </TouchableOpacity>
+                        </View>
+                    )}
+
                     {selectedNode && BackendUtils.supportsOffers() && (
                         <View
                             style={{