Merge pull request #510 from lbryio/release-0.6.1

app/src/component/floatingWalletBalance/view.js

@@ -18,6 +18,12 @@ class FloatingWalletBalance extends React.PureComponent<Props> {
 
     return (
       <View style={[floatingButtonStyle.view, floatingButtonStyle.bottomRight]}>
+        {unclaimedRewardAmount > 0 &&
+        <TouchableOpacity style={floatingButtonStyle.pendingContainer}
+          onPress={() => navigation && navigation.navigate({ routeName: 'Rewards' })} >
+          <Icon name="award" size={18} style={floatingButtonStyle.rewardIcon} />
+          <Text style={floatingButtonStyle.text}>{unclaimedRewardAmount}</Text>
+        </TouchableOpacity>}
         <TouchableOpacity style={floatingButtonStyle.container}
                           onPress={() => navigation && navigation.navigate({ routeName: 'WalletStack' })}>
           {isNaN(balance) && <ActivityIndicator size="small" color={Colors.White} />}
@@ -25,12 +31,6 @@ class FloatingWalletBalance extends React.PureComponent<Props> {
             {(balance || balance === 0) && (formatCredits(parseFloat(balance), 2) + ' LBC')}
           </Text>
         </TouchableOpacity>
-        {unclaimedRewardAmount > 0 &&
-        <TouchableOpacity style={floatingButtonStyle.pendingContainer}
-          onPress={() => navigation && navigation.navigate({ routeName: 'Rewards' })} >
-          <Icon name="award" size={18} style={floatingButtonStyle.rewardIcon} />
-          <Text style={floatingButtonStyle.text}>{unclaimedRewardAmount}</Text>
-        </TouchableOpacity>}
       </View>
     );
   }

app/src/styles/floatingButton.js

@@ -30,9 +30,9 @@ const floatingButtonStyle = StyleSheet.create({
   pendingContainer: {
     borderRadius: 24,
     padding: 14,
-    paddingLeft: 70,
-    paddingRight: 20,
-    marginLeft: -60,
+    paddingLeft: 20,
+    paddingRight: 70,
+    marginRight: -60,
     alignItems: 'center',
     justifyContent: 'center',
     backgroundColor: Colors.BrighterLbryGreen,

src/main/python/main.py

@@ -1,4 +1,4 @@
-__version__ = "0.6.0"
+__version__ = "0.6.1"
 
 class ServiceApp(App):
     def build(self):