Cross-device sync implementation #505

Merged
akinwale merged 38 commits from sync into master 2019-04-22 14:42:48 +02:00
2 changed files with 9 additions and 9 deletions
Showing only changes of commit 4ce424d4db - Show all commits

View file

@ -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>
);
}

View file

@ -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,