Merge pull request #13 from cmtanko/APP-014-fully-scrollable-view

[APP-014] Fix scrolling issue
cmtanko · Apr 27, 2021 · ca26861 · ca26861
2 parents 261f9b6 + 2e17d02
commit ca26861
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/src/components/Dashboard/index.js b/src/components/Dashboard/index.js
@@ -1,18 +1,17 @@
 import _ from 'lodash';
 import React, {Component} from 'react';
 import {
+  Fab,
   Tab,
   Tabs,
-  Content,
-  Fab,
+  View,
   Icon,
   Container,
   ScrollableTab,
 } from 'native-base';
 
-// import ActionButtonView from './ActionButtonView';
-import RecordList from './RecordList';
 import {MONTHS} from '../../config';
+import RecordList from './RecordList';
 
 import cs from '../../styles/common';
 
@@ -36,11 +35,12 @@ export default class Dashboard extends Component {
         <Tab
           key={id}
           heading={val}
+          style={cs.bg_dark_lightblue}
           tabStyle={cs.bg_dark_blue}
           activeTabStyle={cs.bg_dark_lightblue}>
-          <Content style={cs.bg_dark_lightblue}>
+          <View style={cs.bg_dark_lightblue}>
             <RecordList selectedMonth={id} navigate={navigate} />
-          </Content>
+          </View>
         </Tab>
       );
     });

diff --git a/src/components/ReportPage/ReportDetail.js b/src/components/ReportPage/ReportDetail.js
@@ -1,12 +1,7 @@
 import {connect} from 'react-redux';
 import React, {useState, useEffect} from 'react';
 import Carousel from 'react-native-carousel-view';
-import {
-  VictoryPie,
-  VictoryBar,
-  VictoryLabel,
-  VictoryTheme,
-} from 'victory-native';
+import {VictoryPie, VictoryBar, VictoryTheme} from 'victory-native';
 import {Text, View, Dimensions, Platform} from 'react-native';
 
 import {} from 'react-native';
@@ -83,7 +78,6 @@ const ReportDetail = (props) => {
               Cash Flow
             </Text>
             <VictoryBar
-              domainPadding={{x: [10, -10], y: 5}}
               theme={VictoryTheme.material}
               colorScale={colorScale}
               width={deviceWidth - 40}

diff --git a/src/components/ReportPage/index.js b/src/components/ReportPage/index.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
 import React from 'react';
 import moment from 'moment';
 import {connect} from 'react-redux';
-import {Container, Content, Button, Segment, Text} from 'native-base';
+import {Container, View, Button, Segment, Text} from 'native-base';
 
 import cs from '../../styles/common';
 import {selectReportType} from '../../actions';
@@ -96,13 +96,13 @@ const ReportPage = (props) => {
         </Button>
       </Segment>
 
-      <Content>
+      <View>
         <ReportDetail
           data={getData(incomeCatgories, records)}
           expenseData={getData(expenseCategories, records)}
           yearWiseData={yearWiseData}
         />
-      </Content>
+      </View>
     </Container>
   );
 };