[FIX] #21 & #12 monthly error.

victorbalssa · Jul 22, 2022 · 201d486 · 201d486
1 parent 0bbf755
commit 201d486
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/src/models/firefly.ts b/src/models/firefly.ts
@@ -181,19 +181,19 @@ export default createModel<RootModel>()({
 
       switch (rangeInt) {
         case 1:
-          rangeTitle = `${moment(start).utc().format('MMMM')} ${moment(start).utc().year()}.`;
+          rangeTitle = `${moment(end).format('MMM')} ${moment(end).year()}.`;
           break;
         case 3:
-          rangeTitle = `Q${moment(start).utc().quarter()} ${moment(start).utc().year()}.`;
+          rangeTitle = `Q${moment(start).quarter()} ${moment(start).year()}.`;
           break;
         case 6:
-          rangeTitle = `S${moment(start).utc().quarter() < 3 ? 1 : 2} ${moment(start).utc().year()}.`;
+          rangeTitle = `S${moment(start).quarter() < 3 ? 1 : 2} ${moment(start).year()}.`;
           break;
         case 12:
-          rangeTitle = `${moment(start).utc().year()} Year.`;
+          rangeTitle = `${moment(start).year()} Year.`;
           break;
         default:
-          rangeTitle = `${moment(start).utc().year()} Year.`;
+          rangeTitle = `${moment(start).year()} Year.`;
           break;
       }
 

diff --git a/src/native/components/Oauth.tsx b/src/native/components/Oauth.tsx
@@ -100,6 +100,7 @@ const Configuration = ({
         colorScheme="primary"
         isDisabled={!isValidHttpUrl(backendURL) || config.oauthClientId === ''}
         isLoading={loading}
+        isLoadingText="Submitting..."
         onPress={() => promptAsync()}
       >
         Sign In

diff --git a/src/native/components/UI/RangeTitle.tsx b/src/native/components/UI/RangeTitle.tsx
@@ -22,15 +22,14 @@ const RangeTitle = ({
   <Box
     shadow={2}
     backgroundColor="white"
-    pl={4}
-    pr={4}
+    pl={3}
+    pr={3}
     zIndex={30}
     safeAreaTop
   >
     <HStack justifyContent="space-between" alignItems="center">
       <IconButton
         shadow={2}
-        size="sm"
         borderRadius={15}
         variant="solid"
         _icon={{
@@ -48,7 +47,7 @@ const RangeTitle = ({
           },
         }}
       />
-      <Box flex={1} pl={3} mt={1} height={41} justifyContent="center">
+      <Box pl={2} mt={1} height={41} width={170} justifyContent="center">
         <Text style={{ fontFamily: 'Montserrat_Bold', fontSize: 21 }}>
           {rangeTitle}
         </Text>
@@ -62,7 +61,7 @@ const RangeTitle = ({
         variant="outline"
         dropdownIcon={<></>}
         height={41}
-        width={78}
+        width={84}
         _selectedItem={{
           bg: 'primary.600',
           endIcon: <CheckIcon size="5" />,
@@ -78,7 +77,6 @@ const RangeTitle = ({
 
       <IconButton
         shadow={2}
-        size="sm"
         borderRadius={15}
         variant="solid"
         _icon={{

diff --git a/src/native/index.tsx b/src/native/index.tsx
@@ -89,6 +89,13 @@ const theme = extendTheme({
         fontFamily: 'Montserrat_Bold',
       },
     },
+    IconButton: {
+      baseStyle: {
+        _icon: {
+          size: 'xl',
+        },
+      },
+    },
     Input: {
       baseStyle: {
         borderRadius: 15,

diff --git a/src/native/routes/index.tsx b/src/native/routes/index.tsx
@@ -105,6 +105,7 @@ const TabBarAdvancedButton = ({ onPress }) => (
       _icon={{
         as: AntDesign,
         name: 'edit',
+        size: 'xl',
       }}
       onPress={onPress}
       onTouchStart={() => Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light)}