[Releases] v0.6.0-rc3 (#853)

* Send: make sure destination field doesn't autocorrect (#771)

* Wallet: modify style of Tor restart button (#772)

* Lockscreen enhancements (#773)

* Give autofocus to password field

* Put field in upper half of screen to not get cut off by keyboards

* Update lockscreen colors to match main theme

* Lockscreen: use TextInput component

* Nodes: refresh list after adding/delete node (#776)

* Nodes: refresh when passed new props

* Nodes: refactor node list fetching logic

* Take user back to nodes list after deleting node

* Enforce modal warning text color (#778)

* iOS Version Bump: v0.6.0-rc2 (b) (#779)

* Let users set language on first Splash view (#795)

* Let users set language on first Splash view

* Add quaternary style for Button component

* Update IntroSplash view styling

* Language: make sure English is checked and highlighted if no language set yet

* TextInput: add support for secure text entry (#782)

* Channels: use LoadingIndicator component (#784)

* Activity Navigation (#793)

* Go back to Activity when navigating back on activity items

* Reload activity when returning from activity filters view

* Update header styles (#799)

* Fix support for web URLs on Android (#794)

* QRCodeScanner: new style (#796)

* QA Loading Screen (#797)

* QA Loading Screen

* Connecting to node: fix width of Settings button

* Tweak cert warning modal (#798)

* Set Lato as default font (#800)

* Set Lato as default font

* Add Lato to remaining Text instances

* Add Lato-Bold

* Update LNURL styles (#801)

* Zero amount invoices (#802)

* Allow users to specify amounts for zero amount invoices

* Allow success screens to scroll when dealing with LNURL data

* LND: send custom amount as number

* Fix padding for QR components

* Fix node uri processing on handleAnything

* Intro tour: accomodate more resolutions (#803)

* LND: set default fee limit (#804)

* LNDHub: fix balance refresh (#806)

LNDHub: only fetch Lightning balance

* QR button padding (#807)

* Fix display of BTC units (#808)

* Send: fix fiat rate (#809)

* Send+Receive: unify rate behavior (#810)

* Optimize handleAnything (#811)

* New Splash Screen (#812)

* New iOS splash screen

* Android: update splash launcher

* Restore Wallet view

* Language/Currency: make sure scroll lists don't get cut off (#814)

* Show Zeus mascot head when only one node is saved (#813)

* Theme tweaks (#815)

* Tighten up light theme

* Add BPM theme

* Orange theme

* Orange theme

* Nodes: move Add Node button to top right corner

* Refine orange theme and define outbound and inbound values for all

* Routing: update colors on timeframe tabs

* Remove themeColor calls from stylesheets

* Button: add noUppercase prop (#816)

* Change mascot contact icon to SVG (#817)

* Change mascot contact icon to SVG

* Use SVG for all identicons

* ScanBTCPayConfig: handle Tor URLs (#818)

* added tor support for btcpay scans

* prettier changes

* Make all instance of NodeIdenticon rounded (#821)

* LND: allow self payment (#822)

* Send: fix AMP switch on iOS (#823)

* Payment Request: fix AMP switch (#825)

* Tor: properly handle SendPaymentV2 call (#826)

* Update style of Main Pane (#827)

* Update button styles (#828)

* ZEUS-819: Flip the use tor switch on automatically when scanning tor url (#829)

* ZEUS-819: Flip the use tor switch on automatically when scanning tor url

* Handle BTCPay configs

* Bump react-native-tor to v0.1.8 (#830)

* LNDConnectConfigQRScanner: auto-toggle Tor (#831)

* fixed keyboard collapse on set fees form (#834)

* fixed keyboard collapse on set fees form

* changed set fees form to use scrollview

* prettier

* Remove linear gradient (#841)

* iOS: DropdownSetting: set bg color appropriately across themes (#842)

* Intro tour enhancements: iPod Touch 7th gen (#844)

Intro tour enhancements

undo wallet changes

Remove unused Pagination style

* SetFeesForm: remove preset values (#845)

* Connecting: fix Settings button style (#843)

* Connecting: fix Settings button style

* Make sure button title is always white

* react-native-linear-gradient cleanup (#851)

* Bump url-parse from 1.5.4 to 1.5.7 (#849)

Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.4 to 1.5.7.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](unshiftio/url-parse@1.5.4...1.5.7)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* V0.6.0 rc3 regressions (#852)

* Version bump: v0.6.0-rc3

* Bump iOS build number

* iOS: bump build version

* iOS build version bump

* iOS: bump build version

* iOS: bump build version

* iOS: build version bump

* iOS: bump build version

* iOS: bump build version number

* iOS: bump build version

* Android: maintain mascot for launcher screen

* Button style regressions

* Settings regressions

* Version bump: v0.6.0-rc3 (#805)

* Version bump: v0.6.0-rc3

* Bump iOS build number

* iOS: bump build version

* iOS build version bump

* iOS: bump build version

* iOS: bump build version

* iOS: build version bump

* iOS: bump build version

* iOS: bump build version number

* iOS: bump build version

* iOS: bump build version

* v0.6.0-rc3 iOS build bump (#854)

* iOS: bump build version (#855)

Co-authored-by: deregs <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

android/app/build.gradle

@@ -131,8 +131,8 @@ android {
         applicationId "app.zeusln.zeus"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 33
-        versionName "0.6.0-rc2"
+        versionCode 34
+        versionName "0.6.0-rc3"
         multiDexEnabled true
         missingDimensionStrategy 'react-native-camera', 'general'
     }
@@ -203,7 +203,6 @@ dependencies {
     implementation project(':rn-fetch-blob')
     implementation project(':react-native-randombytes')
     implementation project(':react-native-secure-key-store')
-    implementation project(':react-native-linear-gradient')
     implementation "androidx.core:core:1.1.0"
     implementation "com.facebook.react:react-native:+"  // From node_modules
     implementation 'androidx.appcompat:appcompat:1.1.0-rc01'

android/app/src/main/AndroidManifest.xml

@@ -6,6 +6,17 @@
     <uses-permission android:name="android.permission.NFC" />
     <uses-feature android:name="android.hardware.nfc.hce" android:required="true" />
 
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="http"/>
+        </intent>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="https"/>
+        </intent>
+    </queries>
+
     <application
       android:name=".MainApplication"
       android:label="@string/app_name"

android/app/src/main/java/com/zeus/MainApplication.java

@@ -11,7 +11,6 @@
 import com.swmansion.reanimated.ReanimatedJSIModulePackage;
 
 import com.facebook.react.ReactApplication;
-import com.BV.LinearGradient.LinearGradientPackage;
 import com.swmansion.gesturehandler.react.RNGestureHandlerPackage;
 import com.oblador.vectoricons.VectorIconsPackage;
 import com.facebook.react.ReactNativeHost;

android/app/src/main/res/values/colors.xml

@@ -16,6 +16,6 @@
    <color name="navy">#000080</color>
    <color name="black">#000000</color>
    <color name="orange">#FF7F00</color>
-   <color name="navydark">#1F2328</color>
+   <color name="navydark">#1F242D</color>
    <color name="zeus_background">#FFAB46</color>
-</resources>
+</resources>

android/settings.gradle

@@ -7,8 +7,6 @@ include ':react-native-randombytes'
 project(':react-native-randombytes').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-randombytes/android')
 include ':react-native-secure-key-store'
 project(':react-native-secure-key-store').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-secure-key-store/android')
-include ':react-native-linear-gradient'
-project(':react-native-linear-gradient').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-linear-gradient/android')
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':react-native-secure-key-store'
 project(':react-native-secure-key-store').projectDir = new File(rootProject.projectDir, 	'../node_modules/react-native-secure-key-store/android')

backends/LND.ts

@@ -227,7 +227,8 @@ export default class LND {
         return this.postRequest('/v2/router/send', {
             ...data,
             // Tor timeout is 60 seconds so make sure LND times out first
-            timeout_seconds: 57
+            timeout_seconds: 57,
+            allow_self_payment: true
         });
     };
     closeChannel = (urlParams?: Array<string>) => {

components/Amount.tsx

@@ -3,15 +3,15 @@ import { TouchableOpacity, View } from 'react-native';
 import { inject, observer } from 'mobx-react';
 import UnitsStore from '../stores/UnitsStore';
 import PrivacyUtils from '../utils/PrivacyUtils';
-import ClockIcon from '../images/SVG/Clock.svg';
+import ClockIcon from '../assets/images/SVG/Clock.svg';
 import { themeColor } from '../utils/ThemeUtils';
 import { Spacer } from './layout/Spacer';
 import { Row } from './layout/Row';
 import { Body } from './text/Body';
 
 export const satoshisPerBTC = 100000000;
 
-type Units = 'sats' | 'btc' | 'fiat';
+type Units = 'sats' | 'BTC' | 'fiat';
 
 interface AmountDisplayProps {
     amount: string;
@@ -42,7 +42,7 @@ function AmountDisplay({
         console.error('Must include a symbol when rendering fiat');
     }
 
-    const actualSymbol = unit === 'btc' ? '₿' : symbol;
+    const actualSymbol = unit === 'BTC' ? '₿' : symbol;
 
     const Pending = () => (
         <View
@@ -88,7 +88,7 @@ function AmountDisplay({
                     </View>
                 </Row>
             );
-        case 'btc':
+        case 'BTC':
         case 'fiat':
             if (rtl) {
                 return (

components/Button.tsx

@@ -5,72 +5,112 @@ import { themeColor } from './../utils/ThemeUtils';
 interface ButtonProps {
     title: string;
     icon?: any;
+    titleStyle?: any;
     onPress?: any;
     secondary?: boolean;
     tertiary?: boolean;
+    quaternary?: boolean;
     iconOnly?: boolean;
     adaptiveWidth?: boolean;
     containerStyle?: any;
+    buttonStyle?: any;
+    noUppercase?: boolean;
 }
 
 function Button(props: ButtonProps) {
     const {
         title,
         icon,
+        titleStyle,
         onPress,
         secondary,
         tertiary,
+        quaternary,
         iconOnly,
         adaptiveWidth,
-        containerStyle
+        containerStyle,
+        buttonStyle,
+        noUppercase
     } = props;
 
     const newContainerStyle: any = adaptiveWidth
         ? {
               ...containerStyle,
               borderWidth: secondary ? 2 : 0,
-              borderColor: themeColor('highlight'),
+              borderColor:
+                  (containerStyle && containerStyle.borderColor) ||
+                  themeColor('highlight'),
               alignSelf: 'center',
               borderRadius: 30
           }
         : {
               ...containerStyle,
               borderWidth: secondary ? 2 : 0,
-              borderColor: themeColor('highlight'),
+              borderColor:
+                  (containerStyle && containerStyle.borderColor) ||
+                  themeColor('highlight'),
               alignSelf: 'center',
               borderRadius: 30,
               width: '90%'
           };
 
     return (
         <ElementsButton
-            icon={{
-                ...icon,
-                color: iconOnly
-                    ? themeColor('text')
-                    : secondary
-                    ? themeColor('highlight')
-                    : themeColor('background')
-            }}
+            icon={
+                icon
+                    ? {
+                          color: icon.color
+                              ? icon.color
+                              : iconOnly
+                              ? themeColor('text')
+                              : secondary
+                              ? themeColor('highlight')
+                              : themeColor('background'),
+                          ...icon
+                      }
+                    : {
+                          color: iconOnly
+                              ? themeColor('text')
+                              : secondary
+                              ? themeColor('highlight')
+                              : themeColor('background')
+                      }
+            }
             title={title}
-            buttonStyle={{
-                backgroundColor: iconOnly
-                    ? 'transparent'
-                    : tertiary
-                    ? themeColor('highlight')
-                    : secondary
-                    ? themeColor('secondary')
-                    : themeColor('text')
-            }}
-            titleStyle={{
-                color: iconOnly
-                    ? themeColor('text')
-                    : secondary
-                    ? themeColor('highlight')
-                    : themeColor('background'),
-                textTransform: 'uppercase',
-                fontWeight: 'bold'
-            }}
+            buttonStyle={
+                buttonStyle
+                    ? buttonStyle
+                    : {
+                          backgroundColor: iconOnly
+                              ? 'transparent'
+                              : quaternary
+                              ? themeColor('background')
+                              : tertiary
+                              ? themeColor('highlight')
+                              : secondary
+                              ? themeColor('secondary')
+                              : themeColor('text')
+                      }
+            }
+            titleStyle={
+                titleStyle
+                    ? {
+                          ...titleStyle,
+                          textTransform: noUppercase ? 'none' : 'uppercase',
+                          fontFamily: 'Lato-Bold'
+                      }
+                    : {
+                          color: iconOnly
+                              ? themeColor('text')
+                              : quaternary
+                              ? themeColor('text')
+                              : secondary
+                              ? themeColor('highlight')
+                              : themeColor('background'),
+                          textTransform: noUppercase ? 'none' : 'uppercase',
+                          fontFamily: 'Lato-Bold'
+                      }
+            }
             onPress={onPress}
             containerStyle={newContainerStyle}
         />

components/CollapsedQR.tsx

@@ -9,7 +9,7 @@ import CopyButton from './CopyButton';
 import { localeString } from './../utils/LocaleUtils';
 import { themeColor } from './../utils/ThemeUtils';
 
-const secondaryLogo = require('../images/secondary.png');
+const secondaryLogo = require('../assets/images/secondary.png');
 
 let simulation: any;
 
@@ -85,7 +85,8 @@ export default class CollapsedQR extends React.Component<
                     <Text
                         style={{
                             ...styles.value,
-                            color: themeColor('secondaryText')
+                            color: themeColor('secondaryText'),
+                            fontFamily: 'Lato-Regular'
                         }}
                     >
                         {value}
@@ -111,8 +112,7 @@ export default class CollapsedQR extends React.Component<
                         color: '#fff'
                     }}
                     containerStyle={{
-                        marginTop: 10,
-                        marginBottom: Platform.OS === 'android' ? 10 : 20
+                        margin: 10
                     }}
                     onPress={() => this.toggleCollapse()}
                 />
@@ -127,7 +127,11 @@ export default class CollapsedQR extends React.Component<
                                   )
                         }
                         containerStyle={{
-                            marginBottom: 20
+                            margin: 20
+                        }}
+                        icon={{
+                            name: 'nfc',
+                            size: 25
                         }}
                         onPress={() => this.toggleNfc()}
                         tertiary
@@ -148,6 +152,6 @@ const styles = StyleSheet.create({
         alignItems: 'center',
         alignSelf: 'center',
         padding: 5,
-        marginBottom: 10
+        margin: 10
     }
 });

components/CopyButton.tsx

@@ -1,4 +1,5 @@
 import * as React from 'react';
+import { Platform } from 'react-native';
 import Clipboard from '@react-native-clipboard/clipboard';
 import Button from './../components/Button';
 import { localeString } from './../utils/LocaleUtils';
@@ -63,7 +64,8 @@ export default class CopyButton extends React.Component<
                     size: 25
                 }}
                 containerStyle={{
-                    marginBottom: 10
+                    marginTop: 10,
+                    marginBottom: Platform.OS === 'android' ? 0 : 20
                 }}
                 onPress={() => this.copyToClipboard()}
                 secondary

components/DropdownSetting.tsx

@@ -45,6 +45,7 @@ export default class DropdownSetting extends React.Component<
                     <View style={{ height: 75 }}>
                         <Text
                             style={{
+                                ...styles.secondaryText,
                                 color: themeColor('secondaryText')
                             }}
                         >
@@ -68,6 +69,7 @@ export default class DropdownSetting extends React.Component<
                     <View>
                         <Text
                             style={{
+                                ...styles.secondaryText,
                                 color: themeColor('secondaryText')
                             }}
                         >
@@ -93,6 +95,7 @@ export default class DropdownSetting extends React.Component<
                             <Text
                                 style={{
                                     color: themeColor('text'),
+                                    backgroundColor: themeColor('secondary'),
                                     ...styles.field
                                 }}
                             >
@@ -107,17 +110,20 @@ export default class DropdownSetting extends React.Component<
 }
 
 const styles = StyleSheet.create({
+    secondaryText: {
+        fontFamily: 'Lato-Regular'
+    },
     field: {
         fontSize: 20,
         width: '100%',
         height: 55,
         top: 10,
         paddingTop: 15,
-        backgroundColor: '#31363F',
         borderRadius: 6,
         borderBottomWidth: 20,
         marginBottom: 20,
         paddingLeft: 10,
-        overflow: 'hidden'
+        overflow: 'hidden',
+        fontFamily: 'Lato-Regular'
     }
 });