LBRYCommunity/lbry-fdroid
1
0
Fork 0
Code Issues 4 Pull requests Packages Projects Releases Wiki Activity

Merge pull request #510 from lbryio/release-0.6.1

Browse source
This commit is contained in:
Akinwale Ariwodola 2019-04-02 14:51:57 +01:00 committed by GitHub
parent b21776c517 4ce424d4db
commit 1637752b02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/component/floatingWalletBalance/view.js
View file

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

6
app/src/styles/floatingButton.js
View file

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

2
src/main/python/main.py
View file

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