Merge pull request #1295 from lightninglabs/dev/fix-home-balance-font-size

Dev/fix home balance font size

Author: tanx

src/component/label.js

@@ -15,7 +15,7 @@ const balanceStyles = StyleSheet.create({
   numeral: {
     fontFamily: 'WorkSans ExtraLight',
     fontSize: font.sizeXXXL,
-    lineHeight: font.lineHeightXXXL,
+    lineHeight: null,
   },
   unit: {
     fontFamily: 'WorkSans Regular',
@@ -35,7 +35,13 @@ BalanceLabel.propTypes = {
 };
 
 export const BalanceLabelNumeral = ({ children, style }) => (
-  <Text style={[balanceStyles.numeral, style]}>{children}</Text>
+  <Text
+    style={[balanceStyles.numeral, style]}
+    adjustsFontSizeToFit={true}
+    numberOfLines={1}
+  >
+    {children}
+  </Text>
 );
 
 BalanceLabelNumeral.propTypes = {

src/component/text.js

@@ -65,7 +65,7 @@ export const CopyOnboardText = ({ children = '', style }) => (
 );
 
 CopyOnboardText.propTypes = {
-  children: PropTypes.string.isRequired,
+  children: PropTypes.oneOfType([PropTypes.string, PropTypes.array]),
   style: RNText.propTypes.style,
 };
 
@@ -86,7 +86,7 @@ export const H1Text = ({ children = '', style }) => (
 );
 
 H1Text.propTypes = {
-  children: PropTypes.string.isRequired,
+  children: PropTypes.oneOfType([PropTypes.string, PropTypes.array]),
   style: RNText.propTypes.style,
 };
 
@@ -107,7 +107,7 @@ export const H3Text = ({ children = '', style }) => (
 );
 
 H3Text.propTypes = {
-  children: PropTypes.string.isRequired,
+  children: PropTypes.oneOfType([PropTypes.string, PropTypes.array]),
   style: RNText.propTypes.style,
 };
 
@@ -128,7 +128,7 @@ export const H4Text = ({ children, style }) => (
 );
 
 H4Text.propTypes = {
-  children: PropTypes.string.isRequired,
+  children: PropTypes.oneOfType([PropTypes.string, PropTypes.array]),
   style: RNText.propTypes.style,
 };
 

src/store.js

@@ -94,7 +94,7 @@ export class Store {
       settings: {
         unit: DEFAULT_UNIT,
         fiat: DEFAULT_FIAT,
-        displayFiat: true,
+        displayFiat: false,
         exchangeRate: {},
         restoring: false,
         autopilot: true,

src/view/home.js

@@ -11,11 +11,7 @@ import { H4Text } from '../component/text';
 import Icon from '../component/icon';
 import QrIcon from '../asset/icon/qr';
 import LightningBoltPurpleIcon from '../asset/icon/lightning-bolt-purple';
-import {
-  BalanceLabel,
-  BalanceLabelNumeral,
-  BalanceLabelUnit,
-} from '../component/label';
+import { BalanceLabel, BalanceLabelNumeral } from '../component/label';
 import { Button, GlasButton, DownButton } from '../component/button';
 
 //
@@ -113,9 +109,9 @@ const BalanceDisplay = ({
 }) => (
   <View style={balanceStyles.wrapper}>
     <Button onPress={toggleDisplayFiat}>
+      <H4Text>Total {unitLabel}</H4Text>
       <BalanceLabel>
         <BalanceLabelNumeral>{totalBalanceLabel}</BalanceLabelNumeral>
-        <BalanceLabelUnit>{unitLabel}</BalanceLabelUnit>
       </BalanceLabel>
     </Button>
     <Button onPress={goChannels} style={balanceStyles.percentBtn}>

test/unit/computed/wallet.spec.js

@@ -10,6 +10,7 @@ describe('Computed Wallet Unit Tests', () => {
 
   describe('ComputedWallet()', () => {
     it('should work with initial store', () => {
+      store.settings.displayFiat = true;
       store.channelBalancePendingSatoshis = 0;
       store.channelBalanceOpenSatoshis = 0;
       store.channelBalanceInactiveSatoshis = 0;

test/unit/store.spec.js

@@ -11,7 +11,7 @@ describe('Store Unit Tests', () => {
     it('should set computed vales', () => {
       expect(store.unitFiatLabel, 'to be', undefined);
       store.init();
-      expect(store.unitFiatLabel, 'to equal', '$');
+      expect(store.unitFiatLabel, 'to equal', 'SAT');
     });
   });
 });