From 847c3e85faf7066abc19b8c454aa868e7814a4ca Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Tue, 8 Jan 2019 18:39:10 +0100
Subject: [PATCH] Add backup warning to wallet page. Sort subscriptions.

---
 app/src/page/subscriptions/view.js |  6 ++++--
 app/src/page/wallet/view.js        | 21 ++++++++++++++-------
 app/src/styles/wallet.js           |  7 +++++++
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/app/src/page/subscriptions/view.js b/app/src/page/subscriptions/view.js
index b834ecfb..ebce3d3f 100644
--- a/app/src/page/subscriptions/view.js
+++ b/app/src/page/subscriptions/view.js
@@ -26,7 +26,7 @@ class SubscriptionsPage extends React.PureComponent {
       doFetchRecommendedSubscriptions
     } = this.props;
     doFetchMySubscriptions();
-    doFetchRecommendedSubscriptions();
+    //doFetchRecommendedSubscriptions();
   }
 
   render() {
@@ -63,7 +63,9 @@ class SubscriptionsPage extends React.PureComponent {
               navigation={navigation} />
             )
           }
-          data={allSubscriptions}
+          data={allSubscriptions.sort((a, b) => {
+            return b.height - a.height;
+          })}
           keyExtractor={(item, index) => uriFromFileInfo(item)} />}
 
       {hasSubscriptions && loading &&
diff --git a/app/src/page/wallet/view.js b/app/src/page/wallet/view.js
index 35462c2e..c4813e42 100644
--- a/app/src/page/wallet/view.js
+++ b/app/src/page/wallet/view.js
@@ -1,12 +1,13 @@
 import React from 'react';
 import { ScrollView, Text, View } from 'react-native';
-import TransactionListRecent from '../../component/transactionListRecent';
-import WalletAddress from '../../component/walletAddress';
-import WalletBalance from '../../component/walletBalance';
-import WalletSend from '../../component/walletSend';
-import Button from '../../component/button';
-import Constants from '../../constants';
-import walletStyle from '../../styles/wallet';
+import TransactionListRecent from 'component/transactionListRecent';
+import WalletAddress from 'component/walletAddress';
+import WalletBalance from 'component/walletBalance';
+import WalletSend from 'component/walletSend';
+import Button from 'component/button';
+import Link from 'component/link'
+import Constants from 'constants';
+import walletStyle from 'styles/wallet';
 
 class WalletPage extends React.PureComponent {
   render() {
@@ -28,6 +29,12 @@ class WalletPage extends React.PureComponent {
 
     return (
       <ScrollView keyboardShouldPersistTaps={'handled'}>
+        <View style={walletStyle.warningCard}>
+          <Text style={walletStyle.warningText}>
+            Please backup your wallet file using the instructions at <Link style={walletStyle.warningText} text="https://lbry.io/faq/how-to-backup-wallet#android" href="https://lbry.io/faq/how-to-backup-wallet#android" />.
+          </Text>
+        </View>
+
         <WalletBalance />
         <WalletAddress />
         <WalletSend />
diff --git a/app/src/styles/wallet.js b/app/src/styles/wallet.js
index 65c16e55..935de4ec 100644
--- a/app/src/styles/wallet.js
+++ b/app/src/styles/wallet.js
@@ -33,6 +33,13 @@ const walletStyle = StyleSheet.create({
     marginRight: 16,
     padding: 16
   },
+  warningCard: {
+    backgroundColor: Colors.Orange,
+    padding: 16,
+    marginLeft: 16,
+    marginTop: 16,
+    marginRight: 16
+  },
   transactionsCard: {
     backgroundColor: '#ffffff',
     margin: 16