Merge pull request #44 from OpenDTU-App/cleanup

Author: CommanderRedYT

README.md

@@ -11,7 +11,7 @@ There are signed .apk files inside the "Releases" tab. As of now, the is no plan
 ![IzzyOnDroid Badge](https://img.shields.io/endpoint?url=https://apt.izzysoft.de/fdroid/api/v1/shield/xyz.commanderred.opendtuapp)
 
 ## Development
-There are two branches. `main` is the stable branch, `dev` is the development branch. If you want to contribute, please create a pull request to `dev`.
+There are two branches. `main` is the stable branch, `develop` is the development branch. If you want to contribute, please create a pull request to `develop`.
 
 ## Translations
 Translations are inside a [submodule](https://github.com/OpenDTU-App/opendtu-react-native-translations) located in `src/translations/translation-files`.
@@ -48,7 +48,12 @@ Stuff that I cannot test myself
 - [ ] Multi-Inverter per DTU
 
 ### Devnotes
-- Use `yarn version --patch --no-commit-hooks --no-git-tag-version` to bump version
+- Creating new release
+  - Use `yarn version --patch --no-commit-hooks --no-git-tag-version` to bump version
+  - Push to GitHub
+  - Tag the commit with `vX.Y.Z`
+  - Push the tag to GitHub
+  - Merge `develop` into `main`
 
 ### Early Screenshots
 <img alt="Screenshot_1702075921" src="https://github.com/OpenDTU-App/opendtu-react-native/assets/43087936/1475799f-881d-4eb4-8b1f-1065c64a85c1" width="250">

package.json

@@ -16,7 +16,7 @@
     "ios": "react-native run-ios",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
-    "typecheck": "tsc --noEmit",
+    "typecheck": "tsc --project tsconfig.json --pretty --noEmit --skipLibCheck",
     "start": "react-native start",
     "test": "jest --passWithNoTests",
     "postinstall": "yarn run npm-license-crawler -onlyDirectDependencies -json licenses.json && patch-package",

src/App.tsx

@@ -4,7 +4,7 @@ import moment from 'moment';
 import { PersistGate as ReduxPersistGate } from 'redux-persist/integration/react';
 
 import type { FC } from 'react';
-import React, { useEffect, useMemo, useState } from 'react';
+import { StrictMode, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Appearance, StatusBar } from 'react-native';
 import type { MD3Theme } from 'react-native-paper';
@@ -34,24 +34,26 @@ const App = () => {
   }, []);*/
 
   return (
-    <SafeAreaProvider>
-      <ReduxProvider store={store}>
-        <ReduxPersistGate
-          persistor={persistor}
-          loading={null}
-          // onBeforeLift={onBeforeLift}
-        >
-          <GithubProvider>
-            <ApiProvider>
-              <DatabaseProvider>
-                <_App />
-                <FetchHandler />
-              </DatabaseProvider>
-            </ApiProvider>
-          </GithubProvider>
-        </ReduxPersistGate>
-      </ReduxProvider>
-    </SafeAreaProvider>
+    <StrictMode>
+      <SafeAreaProvider>
+        <ReduxProvider store={store}>
+          <ReduxPersistGate
+            persistor={persistor}
+            loading={null}
+            // onBeforeLift={onBeforeLift}
+          >
+            <GithubProvider>
+              <ApiProvider>
+                <DatabaseProvider>
+                  <_App />
+                  <FetchHandler />
+                </DatabaseProvider>
+              </ApiProvider>
+            </GithubProvider>
+          </ReduxPersistGate>
+        </ReduxProvider>
+      </SafeAreaProvider>
+    </StrictMode>
   );
 };
 

src/api/opendtuapi.ts

@@ -174,7 +174,7 @@ class OpenDtuApi {
       return { deviceState: DeviceState.NotInstance };
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (error: any) {
-      log.error('getSystemStatusFromUrl error', error);
+      log.error('getSystemStatusFromUrl error', error, error.name);
 
       if (error.name === 'AbortError') {
         return { deviceState: DeviceState.Unreachable };

src/components/devices/MDNSScan.tsx

@@ -66,8 +66,6 @@ const MDNSScan: FC<MDNSScanProps> = ({ setError, setLoading, loading }) => {
     };
   }, []);
 
-  console.log('services', services);
-
   if (discovering && services.length === 0) {
     return (
       <Box

src/components/styled/SettingsSurface.tsx

@@ -3,7 +3,7 @@ import styled from 'styled-components';
 import { Surface } from 'react-native-paper';
 
 const SettingsSurface = styled(Surface)`
-  margin: 4px;
+  margin: 4px 8px 12px;
   border-radius: 16px;
 `;
 

src/hooks/useHasLiveData.ts

@@ -1,5 +1,3 @@
-import moment from 'moment';
-
 import ago from '@/utils/ago';
 
 import { useAppSelector } from '@/store';
@@ -39,7 +37,6 @@ const useHasLiveData = (): boolean => {
     }
 
     if (lastUpdateAgo >= 30000) {
-      console.log('lastUpdateAgo', moment(lastUpdate).fromNow());
       console.log('lastUpdateAgo older than 30000 ms');
       return false;
     }

src/slices/settings.ts

@@ -53,6 +53,17 @@ const settingsSlice = createSlice({
       state.selectedDtuConfig = action.payload.index;
     },
     addDtuConfig: (state, action: AddDtuConfigAction) => {
+      if (
+        state.dtuConfigs.find(
+          config => config.baseUrl === action.payload.config.baseUrl,
+        )
+      ) {
+        log.warn(
+          `addDtuConfig: dtuConfigs.find(config => config.baseUrl === ${action.payload.config.baseUrl})`,
+        );
+        return;
+      }
+
       state.dtuConfigs.push(action.payload.config);
       state.selectedDtuConfig = state.dtuConfigs.length - 1;
     },

src/views/navigation/NavigationStack.tsx

@@ -41,30 +41,21 @@ const NavigationStack: FC = () => {
     <Stack.Navigator
       initialRouteName={hasConfigs ? 'MainScreen' : 'SetupAddOpenDTUScreen'}
       screenOptions={{
+        headerShown: false,
         headerBackVisible: false,
         headerTitle: '',
         headerTransparent: true,
       }}
     >
-      <Stack.Screen
-        name="MainScreen"
-        component={MainScreen}
-        options={{ headerShown: false }}
-      />
-      <Stack.Screen
-        name="DeviceListScreen"
-        component={DeviceListScreen}
-        options={{ headerShown: false }}
-      />
+      <Stack.Screen name="MainScreen" component={MainScreen} />
+      <Stack.Screen name="DeviceListScreen" component={DeviceListScreen} />
       <Stack.Screen
         name="SetupAddOpenDTUScreen"
         component={SetupAddOpenDTUScreen}
-        options={{ headerShown: false }}
       />
       <Stack.Screen
         name="SetupAuthenticateOpenDTUInstanceScreen"
         component={SetupAuthenticateOpenDTUInstanceScreen}
-        options={{ headerBackVisible: true }}
       />
       <Stack.Screen
         name="SetupOpenDTUCompleteScreen"
@@ -73,58 +64,38 @@ const NavigationStack: FC = () => {
       <Stack.Screen
         name="DeviceSettingsScreen"
         component={DeviceSettingsScreen}
-        options={{ headerShown: false }}
       />
       <Stack.Screen
         name="SelectDatabaseScreen"
         component={SelectDatabaseScreen}
-        options={{ headerShown: false }}
       />
       <Stack.Screen
         name="ManageDatabasesScreen"
         component={ManageDatabasesScreen}
-        options={{ headerShown: false }}
       />
       <Stack.Screen
         name="AboutSettingsScreen"
         component={AboutSettingsScreen}
-        options={{ headerShown: false }}
       />
       <Stack.Screen
         name="ConfigureGraphsScreen"
         component={ConfigureGraphsScreen}
-        options={{ headerShown: false }}
-      />
-      <Stack.Screen
-        name="AboutOpenDTUScreen"
-        component={AboutOpenDTUScreen}
-        options={{ headerShown: false }}
       />
+      <Stack.Screen name="AboutOpenDTUScreen" component={AboutOpenDTUScreen} />
       <Stack.Screen
         name="NetworkInformationScreen"
         component={NetworkInformationScreen}
-        options={{ headerShown: false }}
       />
       <Stack.Screen
         name="NtpInformationScreen"
         component={NtpInformationScreen}
-        options={{ headerShown: false }}
       />
       <Stack.Screen
         name="MqttInformationScreen"
         component={MqttInformationScreen}
-        options={{ headerBackVisible: true }}
-      />
-      <Stack.Screen
-        name="LicensesScreen"
-        component={LicensesScreen}
-        options={{ headerBackVisible: true }}
-      />
-      <Stack.Screen
-        name="DebugScreen"
-        component={DebugScreen}
-        options={{ headerBackVisible: true }}
       />
+      <Stack.Screen name="LicensesScreen" component={LicensesScreen} />
+      <Stack.Screen name="DebugScreen" component={DebugScreen} />
     </Stack.Navigator>
   );
 };

src/views/navigation/screens/AboutOpenDTUScreen.tsx

@@ -1,5 +1,3 @@
-import type { NavigationProp, ParamListBase } from '@react-navigation/native';
-import { useNavigation } from '@react-navigation/native';
 import { compare } from 'compare-versions';
 import moment from 'moment';
 
@@ -19,17 +17,12 @@ import percentage from '@/utils/percentage';
 
 import { useAppSelector } from '@/store';
 import { StyledSafeAreaView } from '@/style';
+import type { PropsWithNavigation } from '@/views/navigation/NavigationStack';
 
-const AboutOpenDTUScreen: FC = () => {
+const AboutOpenDTUScreen: FC<PropsWithNavigation> = ({ navigation }) => {
   const theme = useTheme();
   const { t } = useTranslation();
 
-  const navigation = useNavigation() as NavigationProp<ParamListBase>;
-
-  const handleBack = useCallback(() => {
-    navigation.goBack();
-  }, [navigation]);
-
   const systemStatus = useDtuState(state => state?.systemStatus);
 
   const latestVersion = useAppSelector(
@@ -70,11 +63,8 @@ const AboutOpenDTUScreen: FC = () => {
   return (
     <>
       <Appbar.Header>
-        <Appbar.BackAction onPress={handleBack} />
-        <Appbar.Content
-          title={t('opendtu.systemInformation')}
-          onPress={handleBack}
-        />
+        <Appbar.BackAction onPress={() => navigation.goBack()} />
+        <Appbar.Content title={t('opendtu.systemInformation')} />
       </Appbar.Header>
       <StyledSafeAreaView theme={theme}>
         <Box style={{ width: '100%', flex: 1 }}>