From 4ce424d4db8007cc02a66ff972fbbb70bacf3df1 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Tue, 2 Apr 2019 12:00:33 +0100
Subject: [PATCH] move unclaimed reward amount to the left of floating wallet
balance
---
app/src/component/floatingWalletBalance/view.js | 12 ++++++------
app/src/styles/floatingButton.js | 6 +++---
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/app/src/component/floatingWalletBalance/view.js b/app/src/component/floatingWalletBalance/view.js
index fed4c241..5568ff36 100644
--- a/app/src/component/floatingWalletBalance/view.js
+++ b/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>
);
}
diff --git a/app/src/styles/floatingButton.js b/app/src/styles/floatingButton.js
index c8dd00be..073d4738 100644
--- a/app/src/styles/floatingButton.js
+++ b/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,