diff --git a/src/component/floatingWalletBalance/view.js b/src/component/floatingWalletBalance/view.js index db65790..9b47a58 100644 --- a/src/component/floatingWalletBalance/view.js +++ b/src/component/floatingWalletBalance/view.js @@ -23,7 +23,7 @@ class FloatingWalletBalance extends React.PureComponent { style={floatingButtonStyle.pendingContainer} onPress={() => navigation && navigation.navigate({ routeName: 'Rewards' })} > - + {unclaimedRewardAmount} )} @@ -31,9 +31,10 @@ class FloatingWalletBalance extends React.PureComponent { style={floatingButtonStyle.container} onPress={() => navigation && navigation.navigate({ routeName: 'WalletStack' })} > + {isNaN(balance) && } {(!isNaN(balance) || balance === 0) && ( - {formatCredits(parseFloat(balance), 2) + ' LBC'} + {formatCredits(parseFloat(balance), 0)} )} diff --git a/src/styles/floatingButton.js b/src/styles/floatingButton.js index b092b17..e1e1aff 100644 --- a/src/styles/floatingButton.js +++ b/src/styles/floatingButton.js @@ -13,13 +13,14 @@ const floatingButtonStyle = StyleSheet.create({ container: { zIndex: 100, borderRadius: 24, - padding: 14, - paddingLeft: 20, - paddingRight: 20, + padding: 10, + paddingLeft: 16, + paddingRight: 16, alignItems: 'center', justifyContent: 'center', + flexDirection: 'row', backgroundColor: Colors.LbryGreen, - shadowColor: 'black', + shadowColor: Colors.Black, shadowOpacity: 0.1, shadowRadius: StyleSheet.hairlineWidth, shadowOffset: { @@ -29,10 +30,10 @@ const floatingButtonStyle = StyleSheet.create({ }, pendingContainer: { borderRadius: 24, - padding: 14, - paddingLeft: 20, - paddingRight: 70, - marginRight: -60, + padding: 10, + paddingLeft: 12, + paddingRight: 58, + marginRight: -52, alignItems: 'center', justifyContent: 'center', backgroundColor: Colors.BrighterLbryGreen, @@ -41,8 +42,8 @@ const floatingButtonStyle = StyleSheet.create({ }, text: { color: Colors.White, - fontFamily: 'Inter-UI-Bold', - fontSize: 18, + fontFamily: 'Inter-UI-SemiBold', + fontSize: 16, }, bottomRight: { right: 10, @@ -50,7 +51,11 @@ const floatingButtonStyle = StyleSheet.create({ }, rewardIcon: { color: Colors.White, - marginRight: 4, + marginRight: 2, + }, + balanceIcon: { + color: Colors.White, + marginRight: 3, }, });