Revert "[Releases] v0.6.0-beta1 (#690)" (#695)

This reverts commit 28038ec.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -32,7 +32,6 @@ If applicable, add screenshots to help explain your problem.
  - Device: [e.g. iPhone6]
  - OS: [e.g. iOS8.1]
  - Zeus Version [e.g. v0.1.0]
- - Clearnet or Tor
 
 **Additional context**
 Add any other context about the problem here.

Navigation.ts

@@ -35,7 +35,7 @@ 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 SignVerifyMessage from './views/Settings/SignVerifyMessage';
+import SignMessage from './views/Settings/SignMessage';
 import Help from './views/Settings/Help';
 
 // Routing
@@ -112,8 +112,8 @@ const AppScenes = {
     CertInstallInstructions: {
         screen: CertInstallInstructions
     },
-    SignVerifyMessage: {
-        screen: SignVerifyMessage
+    SignMessage: {
+        screen: SignMessage
     },
     Transaction: {
         screen: Transaction

android/app/build.gradle

@@ -131,8 +131,8 @@ android {
         applicationId "app.zeusln.zeus"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 30
-        versionName "0.6.0-beta1"
+        versionCode 29
+        versionName "0.6.0-alpha4"
         multiDexEnabled true
         missingDimensionStrategy 'react-native-camera', 'general'
     }
@@ -206,9 +206,6 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha02'
     implementation files("../../node_modules/react-native-tor/android/libs/sifir_android.aar")
-    // gif
-    implementation 'com.facebook.fresco:fresco:2.0.0'
-    implementation 'com.facebook.fresco:animated-gif:2.0.0'
 
     if (enableHermes) {
         def hermesPath = "../../node_modules/hermes-engine/android/";

backends/CLightningREST.ts

@@ -138,10 +138,6 @@ export default class CLightningREST extends LND {
         this.postRequest('/v1/utility/signMessage', {
             message: message
         });
-    verifyMessage = (data: any) =>
-        this.getRequest(
-            `/v1/utility/checkMessage/${data.msg}/${data.signature}`
-        );
 
     supportsMessageSigning = () => true;
     supportsMPP = () => false;
@@ -150,5 +146,4 @@ export default class CLightningREST extends LND {
     supportsHopPicking = () => false;
     supportsRouting = () => true;
     supportsNodeInfo = () => true;
-    singleFeesEarnedTotal = () => true;
 }

backends/Eclair.ts

@@ -462,12 +462,7 @@ export default class Eclair {
 
     signMessage = (message: string) =>
         this.api('signmessage', {
-            msg: Base64Utils.btoa(message)
-        });
-    verifyMessage = (data: any) =>
-        this.api('verifymessage', {
-            msg: Base64Utils.btoa(data.msg),
-            sig: data.signature
+            msg: message
         });
 
     supportsMessageSigning = () => true;
@@ -480,7 +475,6 @@ export default class Eclair {
     supportsHopPicking = () => false;
     supportsRouting = () => true;
     supportsNodeInfo = () => true;
-    singleFeesEarnedTotal = () => false;
 }
 
 const mapInvoice =

backends/LND.ts

@@ -2,7 +2,6 @@ import RNFetchBlob from 'rn-fetch-blob';
 import stores from '../stores/Stores';
 import { doTorRequest, RequestMethod } from '../utils/TorUtils';
 import OpenChannelRequest from './../models/OpenChannelRequest';
-import Base64Utils from './../utils/Base64Utils';
 import VersionUtils from './../utils/VersionUtils';
 import { localeString } from './../utils/LocaleUtils';
 
@@ -202,13 +201,7 @@ export default class LND {
     getPayments = () => this.getRequest('/v1/payments');
     getNewAddress = () => this.getRequest('/v1/newaddress');
     openChannel = (data: OpenChannelRequest) =>
-        this.postRequest('/v1/channels', {
-            private: data.private,
-            local_funding_amount: data.local_funding_amount,
-            min_confs: data.min_confs,
-            node_pubkey_string: data.node_pubkey_string,
-            sat_per_byte: data.sat_per_byte
-        });
+        this.postRequest('/v1/channels', data);
     openChannelStream = (data: OpenChannelRequest) =>
         this.wsReq('/v1/channels/stream', 'POST', data);
     connectPeer = (data: any) => this.postRequest('/v1/peers', data);
@@ -240,16 +233,11 @@ export default class LND {
     getNodeInfo = (urlParams?: Array<string>) =>
         this.getRequest(`/v1/graph/node/${urlParams && urlParams[0]}`);
     getFees = () => this.getRequest('/v1/fees');
-    setFees = (data: any) =>
-        this.postRequest('/v1/chanpolicy', {
-            base_fee_msat: data.base_fee_msat,
-            fee_rate: `${Number(data.fee_rate) / 100}`,
-            chan_point: {
-                funding_txid_str: data.chan_point.funding_txid_str,
-                output_index: data.chan_point.output_index
-            },
-            time_lock_delta: data.time_lock_delta
-        });
+    setFees = (data: any) => {
+        const request = { ...data };
+        request.fee_rate = `${Number(data.fee_rate) / 100}`;
+        return this.postRequest('/v1/chanpolicy', data);
+    };
     getRoutes = (urlParams?: Array<string>) =>
         this.getRequest(
             `/v1/graph/routes/${urlParams && urlParams[0]}/${
@@ -278,15 +266,8 @@ export default class LND {
         this.postRequest('/v2/wallet/accounts/import', data);
     signMessage = (message: string) =>
         this.postRequest('/v1/signmessage', {
-            msg: Base64Utils.btoa(message)
-        });
-    verifyMessage = (data: any) =>
-        this.postRequest('/v1/verifymessage', {
-            msg: Base64Utils.btoa(data.msg),
-            signature: data.signature
+            msg: message
         });
-    subscribeInvoice = (r_hash: string) =>
-        this.getRequest(`/v2/invoices/subscribe/${r_hash}`);
 
     // LndHub
     createAccount = (
@@ -322,5 +303,4 @@ export default class LND {
     supportsNodeInfo = () => true;
     supportsCoinControl = () => this.supports('v0.12.0');
     supportsAccounts = () => this.supports('v0.13.0');
-    singleFeesEarnedTotal = () => false;
 }

backends/LndHub.ts

@@ -77,5 +77,4 @@ export default class LndHub extends LND {
     supportsHopPicking = () => false;
     supportsRouting = () => false;
     supportsNodeInfo = () => false;
-    singleFeesEarnedTotal = () => false;
 }

backends/Spark.ts

@@ -316,5 +316,4 @@ export default class Spark {
     supportsCoinControl = () => false;
     supportsHopPicking = () => false;
     supportsRouting = () => true;
-    singleFeesEarnedTotal = () => false;
 }

components/Button.tsx

@@ -30,16 +30,14 @@ function Button(props: ButtonProps) {
               ...containerStyle,
               borderWidth: secondary ? 2 : 0,
               borderColor: themeColor('highlight'),
-              alignSelf: 'center',
-              borderRadius: 30
+              alignSelf: 'center'
           }
         : {
               ...containerStyle,
               borderWidth: secondary ? 2 : 0,
               borderColor: themeColor('highlight'),
               alignSelf: 'center',
-              borderRadius: 30,
-              width: '90%'
+              width: '100%'
           };
 
     return (
@@ -55,12 +53,12 @@ function Button(props: ButtonProps) {
             title={title}
             buttonStyle={{
                 backgroundColor: iconOnly
-                    ? 'transparent'
+                    ? themeColor('background')
                     : tertiary
-                    ? themeColor('highlight')
+                    ? themeColor('text')
                     : secondary
                     ? themeColor('secondary')
-                    : themeColor('text')
+                    : themeColor('highlight')
             }}
             titleStyle={{
                 color: iconOnly

components/Channels/Tag.tsx

@@ -52,9 +52,7 @@ export function Tag({ status }: { status: Status }) {
                 />
                 <Spacer width={6} />
                 {/* TODO: localize */}
-                <Body colorOverride="white" small>
-                    {status}
-                </Body>
+                <Body small>{status}</Body>
             </Row>
         </View>
     );

components/DropdownSetting.tsx

@@ -42,7 +42,7 @@ export default class DropdownSetting extends React.Component<
         return (
             <React.Fragment>
                 {Platform.OS !== 'ios' && (
-                    <View style={{ height: 75 }}>
+                    <View>
                         <Text
                             style={{
                                 color: themeColor('secondaryText')