Merge pull request #36 from victorbalssa/version/0.2.3

version/0.2.3
victorbalssa · Aug 18, 2022 · c2b01d6 · c2b01d6
2 parents 03d5138 + 06f0bc7
commit c2b01d6
Show file tree

Hide file tree

Showing 24 changed files with 724 additions and 377 deletions.
diff --git a/app.json b/app.json
@@ -7,7 +7,7 @@
     "platforms": [
       "ios"
     ],
-    "version": "0.2.2",
+    "version": "0.2.3",
     "orientation": "portrait",
     "icon": "./src/images/icon-abacus.png",
     "splash": {
@@ -20,7 +20,7 @@
       "url": "https://u.expo.dev/292ed6dc-804c-4444-95f5-fa5d76d9913b"
     },
     "ios": {
-      "buildNumber": "0.2.2",
+      "buildNumber": "0.2.3",
       "bundleIdentifier": "abacus.ios.app",
       "infoPlist": {
         "NSFaceIDUsageDescription": "Abacus use Authentication with TouchId or FaceID"

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "abacus",
   "homepage": "https://github.com/victorbalssa/abacus",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "private": true,
   "jest": {
     "preset": "jest-expo",
@@ -40,7 +40,7 @@
     "expo-secure-store": "~11.3.0",
     "expo-splash-screen": "~0.16.1",
     "expo-status-bar": "~1.4.0",
-    "expo-updates": "~0.14.3",
+    "expo-updates": "~0.14.4",
     "expo-web-browser": "~11.0.0",
     "globally": "^0.0.0",
     "lodash": "^4.17.21",
@@ -67,8 +67,9 @@
     "slash": "^3.0.0",
     "victory-native": "^36.3.1",
     "expo-local-authentication": "~12.3.0",
-    "expo-dev-client": "~1.1.1",
-    "expo-application": "~4.2.2"
+    "expo-dev-client": "~1.2.1",
+    "expo-application": "~4.2.2",
+    "expo-blur": "~11.2.0"
   },
   "devDependencies": {
     "@babel/core": "^7.18.6",

diff --git a/src/components/Chart.tsx b/src/components/Chart.tsx
@@ -1,52 +1,37 @@
 import React from 'react';
-import { RefreshControl } from 'react-native';
 import {
-  Box,
   ScrollView,
 } from 'native-base';
+import { View } from 'react-native';
 import AssetsHistoryChart from './Charts/AssetsHistoryChart';
 import RangeTitle from './UI/RangeTitle';
-import colors from '../constants/colors';
 
 const Chart = ({
-  accounts,
   loading,
+  accounts,
   fetchData,
   filterData,
   start,
   end,
-  enableScroll,
-  disableScroll,
-  scrollEnabled,
+  backendURL,
 }) => (
   <>
     <RangeTitle />
-    <Box flex={1}>
-      <ScrollView
-        p={3}
-        shadow={3}
-        _contentContainerStyle={{
-          alignItems: 'center',
-        }}
-        refreshControl={(
-          <RefreshControl
-            refreshing={loading}
-            onRefresh={fetchData}
-            tintColor={colors.brandStyle}
-          />
-      )}
-        scrollEnabled={scrollEnabled}
-      >
-        <AssetsHistoryChart
-          start={start}
-          end={end}
-          accounts={accounts}
-          filterData={filterData}
-          enableScroll={enableScroll}
-          disableScroll={disableScroll}
-        />
-      </ScrollView>
-    </Box>
+    <ScrollView
+      p={2}
+      bounces={false}
+    >
+      <AssetsHistoryChart
+        loading={loading}
+        fetchData={fetchData}
+        start={start}
+        end={end}
+        accounts={accounts}
+        filterData={filterData}
+        backendURL={backendURL}
+      />
+      <View style={{ height: 100 }} />
+    </ScrollView>
   </>
 );