#286 - (version/0.16.0)

victorbalssa · May 19, 2024 · a196aa6 · a196aa6
1 parent 59d0e99
commit a196aa6
Show file tree

Hide file tree

Showing 10 changed files with 1,560 additions and 1,779 deletions.
diff --git a/app.config.js b/app.config.js
@@ -9,7 +9,7 @@ export default {
     'ios',
     'android',
   ],
-  version: '0.15.0',
+  version: '0.16.0',
   orientation: 'portrait',
   updates: {
     enabled: true,
@@ -38,7 +38,7 @@ export default {
       usesNonExemptEncryption: false,
     },
     bundleIdentifier: IS_DEV ? 'abacus.fireflyiii.ios.app.dev' : 'abacus.ios.app',
-    buildNumber: '0.15.0',
+    buildNumber: '0.16.0',
   },
   android: {
     icon: './src/images/icon-abacus.png',
@@ -56,7 +56,7 @@ export default {
     },
     playStoreUrl: 'https://play.google.com/store/apps/details?id=abacus.fireflyiii.android.app',
     package: IS_DEV ? 'abacus.fireflyiii.android.app.dev' : 'abacus.fireflyiii.android.app',
-    versionCode: 23,
+    versionCode: 24,
   },
   scheme: 'abacusfiiiapp',
   githubUrl: 'https://github.com/victorbalssa/abacus',
@@ -69,6 +69,8 @@ export default {
     },
   },
   plugins: [
+    'expo-asset',
+    'expo-secure-store',
     'expo-localization',
     './plugins/withAndroidStyles',
     './plugins/withAndroidManifest',

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "abacus",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "private": true,
   "homepage": "https://github.com/victorbalssa/abacus",
   "scripts": {
@@ -18,57 +18,57 @@
     ]
   },
   "dependencies": {
-    "@expo/config-plugins": "~7.8.0",
-    "@expo/metro-runtime": "~3.1.3",
+    "@expo/config-plugins": "~8.0.0",
+    "@expo/metro-runtime": "~3.2.1",
     "@expo/vector-icons": "^14.0.0",
-    "@react-native-async-storage/async-storage": "1.21.0",
-    "@react-native-community/datetimepicker": "7.6.1",
+    "@react-native-async-storage/async-storage": "1.23.1",
+    "@react-native-community/datetimepicker": "8.0.1",
     "@react-navigation/bottom-tabs": "6.5.14",
     "@react-navigation/native": "6.1.12",
     "@react-navigation/native-stack": "6.9.20",
     "@rematch/core": "^2.2.0",
     "@rematch/loading": "^2.1.2",
     "@rematch/persist": "^2.1.2",
-    "@shopify/react-native-skia": "0.1.221",
+    "@shopify/react-native-skia": "1.2.3",
     "axios": "1.6.7",
     "babel-polyfill": "^6.26.0",
     "base-64": "^1.0.0",
     "bootstrap": "^4.4.1",
-    "expo": "~50.0.17",
-    "expo-application": "~5.8.4",
-    "expo-asset": "~9.0.2",
-    "expo-auth-session": "~5.4.0",
-    "expo-blur": "~12.9.2",
-    "expo-clipboard": "~5.0.1",
-    "expo-crypto": "~12.8.1",
-    "expo-dev-client": "~3.3.11",
-    "expo-device": "~5.9.4",
-    "expo-font": "~11.10.2",
-    "expo-haptics": "~12.8.1",
-    "expo-linear-gradient": "~12.7.2",
-    "expo-linking": "~6.2.2",
-    "expo-local-authentication": "~13.8.0",
-    "expo-localization": "~14.8.4",
-    "expo-random": "~13.6.0",
-    "expo-secure-store": "~12.8.1",
-    "expo-status-bar": "~1.11.1",
-    "expo-store-review": "~6.8.3",
-    "expo-system-ui": "~2.9.4",
-    "expo-updates": "~0.24.12",
+    "expo": "^51.0.8",
+    "expo-application": "~5.9.1",
+    "expo-asset": "~10.0.6",
+    "expo-auth-session": "~5.5.2",
+    "expo-blur": "~13.0.2",
+    "expo-clipboard": "~6.0.3",
+    "expo-crypto": "~13.0.2",
+    "expo-dev-client": "~4.0.14",
+    "expo-device": "~6.0.2",
+    "expo-font": "~12.0.5",
+    "expo-haptics": "~13.0.1",
+    "expo-linear-gradient": "~13.0.2",
+    "expo-linking": "~6.3.1",
+    "expo-local-authentication": "~14.0.1",
+    "expo-localization": "~15.0.3",
+    "expo-random": "~14.0.1",
+    "expo-secure-store": "~13.0.1",
+    "expo-status-bar": "~1.12.1",
+    "expo-store-review": "~7.0.2",
+    "expo-system-ui": "~3.0.4",
+    "expo-updates": "~0.25.14",
     "globally": "^0.0.0",
     "i18n-js": "^4.1.1",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-helmet": "^5.2.1",
-    "react-native": "0.73.6",
-    "react-native-gesture-handler": "~2.14.0",
-    "react-native-pager-view": "6.2.3",
-    "react-native-reanimated": "~3.6.2",
-    "react-native-safe-area-context": "4.8.2",
-    "react-native-screens": "~3.29.0",
-    "react-native-svg": "14.1.0",
+    "react-native": "0.74.1",
+    "react-native-gesture-handler": "~2.16.1",
+    "react-native-pager-view": "6.3.0",
+    "react-native-reanimated": "~3.10.1",
+    "react-native-safe-area-context": "4.10.1",
+    "react-native-screens": "3.31.1",
+    "react-native-svg": "15.2.0",
     "react-native-swipe-list-view": "^3.2.9",
     "react-redux": "9.1.0",
     "redux": "5.0.1",
@@ -79,14 +79,14 @@
     "victory-native": "^36.9.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.23.2",
+    "@babel/core": "^7.24.0",
     "@types/jest": "^29.5.8",
     "@types/lodash": "^4.14.197",
     "@types/node": "^20.9.0",
-    "@types/react": "~18.2.45",
+    "@types/react": "~18.2.79",
     "@typescript-eslint/eslint-plugin": "^5.30.0",
     "@typescript-eslint/parser": "^5.62.0",
-    "babel-preset-expo": "^10.0.0",
+    "babel-preset-expo": "~11.0.0",
     "detox": "20.18.1",
     "dotenv": "^16.3.1",
     "eslint": "^7.32.0",
@@ -95,7 +95,7 @@
     "eslint-plugin-jest": "^27.2.3",
     "eslint-plugin-jsx-a11y": "^6.8.0",
     "eslint-plugin-react": "^7.33.1",
-    "jest-expo": "~50.0.4",
+    "jest-expo": "~51.0.2",
     "node-sass": "9.0.0",
     "ts-jest": "29.1.2",
     "ts-node": "10.9.1",

diff --git a/src/components/Forms/TransactionSplitForm.tsx b/src/components/Forms/TransactionSplitForm.tsx
@@ -319,6 +319,7 @@ export default function TransactionSplitForm({
         onSelectAutocomplete={(autocomplete) => setTransaction({
           ...formData,
           sourceName: autocomplete.name,
+          sourceId: autocomplete.id,
           currencyCode: autocomplete.currencyCode,
           currencySymbol: autocomplete.currencySymbol,
         })}
@@ -340,6 +341,7 @@ export default function TransactionSplitForm({
         onSelectAutocomplete={(autocomplete) => setTransaction({
           ...formData,
           destinationName: autocomplete.name,
+          destinationId: autocomplete.id,
         })}
         InputRightElement={deleteBtn(['destinationName'])}
         routeApi="accounts"
@@ -439,7 +441,9 @@ export default function TransactionSplitForm({
           setTransaction({
             date: new Date(),
             sourceName: '',
+            sourceId: null,
             destinationName: '',
+            destinationId: null,
             description: '',
             amount: '',
             type: 'withdrawal',

diff --git a/src/components/Screens/ConfigurationScreen.tsx b/src/components/Screens/ConfigurationScreen.tsx
@@ -95,7 +95,7 @@ export default function ConfigurationScreen({ navigation }: ScreenType) {
       CommonActions.reset({
         index: 0,
         routes: [
-          { name: 'credentials' },
+          { name: 'credentials', params: { noRedirect: true } },
         ],
       }),
     );

diff --git a/src/components/Screens/CredentialsScreen.tsx b/src/components/Screens/CredentialsScreen.tsx
@@ -22,7 +22,7 @@ import { ScreenType } from '../../types/screen';
 import { RootDispatch, RootState } from '../../store';
 import AButton from '../UI/ALibrary/AButton';
 
-export default function CredentialsScreen({ navigation }: ScreenType) {
+export default function CredentialsScreen({ navigation, route }: ScreenType) {
   const { colors } = useThemeColors();
   const { name: routeName } = useRoute();
   const useBiometricAuth = useSelector((state: RootState) => state.configuration.useBiometricAuth);
@@ -67,7 +67,12 @@ export default function CredentialsScreen({ navigation }: ScreenType) {
       }
 
       setAuthenticated(true);
-      if (c.length === 1 && routeName === 'credentials') {
+      const {
+        params: {
+          noRedirect = false,
+        } = {},
+      } = route;
+      if (c.length === 1 && routeName === 'credentials' && !noRedirect) {
         await loginWithCredential(c[0]);
       }
     })();

diff --git a/src/components/UI/ErrorWidget.tsx b/src/components/UI/ErrorWidget.tsx
@@ -19,7 +19,7 @@ export default function ErrorWidget() {
       CommonActions.reset({
         index: 0,
         routes: [
-          { name: 'credentials' },
+          { name: 'credentials', params: { noRedirect: true } },
         ],
       }),
     );
@@ -37,7 +37,7 @@ export default function ErrorWidget() {
         showToast(translate('transaction_form_success_title'), translate('transaction_form_success_description'), 'success');
       }
 
-      if (error && (error as AxiosError).response?.status && (error as AxiosError).response?.status === 404 && !isFirstRun.current) {
+      if (error && (error as AxiosError).response?.status && [401, 403].includes((error as AxiosError).response?.status) && !isFirstRun.current) {
         goToCredentials();
       }
 

diff --git a/src/models/accounts.ts b/src/models/accounts.ts
@@ -133,19 +133,19 @@ export default createModel<RootModel>()({
       if (currentCode) {
         const [
           { data: accounts },
-          { data: frontPageAccounts },
+          { data: frontpageAccounts },
         ] = await Promise.all([
           dispatch.configuration.apiFetch({ url: `/api/v1/currencies/${currentCode}/accounts?${displayAllAccounts ? '' : 'type=asset'}&date=${end}` }) as Promise<{ data: AccountType[] }>,
-          dispatch.configuration.apiFetch({ url: '/api/v2/preferences/frontPageAccounts' }) as Promise<{ data: PreferenceType }>,
+          dispatch.configuration.apiFetch({ url: '/api/v1/preferences/frontpageAccounts' }) as Promise<{ data: PreferenceType }>,
         ]);
 
         const filteredAccounts = accounts
           .filter((a: AccountType) => a.attributes.active)
           .sort((a, b) => (b.attributes.order < a.attributes.order ? 1 : -1));
 
-        if (frontPageAccounts) {
+        if (frontpageAccounts) {
           accounts.forEach((a: AccountType, index) => {
-            accounts[index].display = frontPageAccounts.attributes.data.includes(parseInt(a.id, 10));
+            accounts[index].display = frontpageAccounts.attributes.data.includes(parseInt(a.id, 10));
           });
         }
 

diff --git a/src/models/transactions.ts b/src/models/transactions.ts
@@ -17,7 +17,9 @@ export type TransactionSplitType = {
   currencyDecimalPlaces?: number,
   date: string | Date,
   sourceName: string,
+  sourceId: number,
   destinationName: string,
+  destinationId: number,
   tags: string[],
   notes: string,
   foreignAmount: string,
@@ -327,7 +329,9 @@ export default createModel<RootModel>()({
           description: transaction.description,
           date: transaction.date,
           source_name: transaction.sourceName,
+          source_id: transaction.sourceId,
           destination_name: transaction.destinationName,
+          destination_id: transaction.destinationId,
           category_id: transaction.categoryName === '' ? undefined : transaction.categoryId,
           category_name: transaction.categoryName,
           budget_id: transaction.budgetId,

diff --git a/src/types/screen.ts b/src/types/screen.ts
@@ -22,6 +22,7 @@ export interface ScreenType {
       };
       id?: string;
       forceRefresh?: boolean | undefined;
+      noRedirect?: boolean;
       filterType?: string;
       selectFilter?: (filter: string) => void;
     }