Merge pull request #547 from firstred/componentwillmount

chore: move deprecated componentWillMount calls to constructor

Author: Crecket

src/react/Components/Layout.jsx

@@ -67,9 +67,15 @@ class Layout extends React.Component {
             initialBunqJSClientRun: false
         };
 
-        this.activityTimer = null;
+        this.checkLanguageChange(this.props);
+
+        if (this.minuteTimer) {
+            clearInterval(this.minuteTimer);
+        }
         this.minuteTimer = null;
 
+        this.activityTimer = null;
+
         ipcRenderer.on("change-path", (event, path) => {
             const currentPath = this.props.history.location.pathname;
 
@@ -129,14 +135,6 @@ class Layout extends React.Component {
         this.minuteTimer = setInterval(this.checkTime, 5000);
     }
 
-    componentWillMount() {
-        this.checkLanguageChange(this.props);
-
-        // unset the minuteTimer when set
-        if (this.minuteTimer) clearInterval(this.minuteTimer);
-        this.minuteTimer = null;
-    }
-
     componentWillUpdate(nextProps) {
         // make sure language is up-to-date
         this.checkLanguageChange(nextProps);

src/react/Pages/RulePage/RulePage.jsx

@@ -15,52 +15,54 @@ import { openSnackbar } from "../../Actions/snackbar";
 class RulesPage extends React.Component {
     constructor(props, context) {
         super(props, context);
-        this.state = {
+
+        let initialState = {
             previewRuleCollection: null,
             previewUpdated: new Date(),
-
             checkedInitial: false,
-
-            initialRules: false
+            initialRules: false,
         };
-    }
 
-    componentWillMount() {
         const searchParams = new URLSearchParams(this.props.location.search);
         if (searchParams.has("value")) {
             const value = searchParams.get("value");
             const field = searchParams.get("field") || "DESCRIPTION";
 
-            this.setState({
+            initialState = {
+                ...initialState,
                 checkedInitial: true,
                 initialRules: [
                     {
                         ruleType: "VALUE",
                         field: field,
                         matchType: "CONTAINS",
                         value: value
-                    }
-                ]
-            });
+                    },
+                ],
+            };
         } else if (searchParams.has("amount")) {
             const amount = searchParams.get("amount");
             const match_type = searchParams.get("match_type") || "EXACTLY";
 
-            this.setState({
+            initialState = {
+                ...initialState,
                 checkedInitial: true,
                 initialRules: [
                     {
                         ruleType: "TRANSACTION_AMOUNT",
                         matchType: match_type,
-                        amount: amount
-                    }
-                ]
-            });
+                        amount: amount,
+                    },
+                ],
+            };
         } else {
-            this.setState({
-                checkedInitial: true
-            });
+            initialState = {
+                ...initialState,
+                checkedInitial: true,
+            };
         }
+
+        this.state = initialState;
     }
 
     updatePreview = ruleCollection => {