From 7129fe83dae086bad49f935885b831083e85abfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Malak?= <pawel999@icloud.com>
Date: Mon, 11 Oct 2021 15:15:26 +0200
Subject: [PATCH] Fixed bug with fetching config. Pushed version 1.7.0

---
 .env                                                         | 2 +-
 CHANGELOG.md                                                 | 4 +++-
 client/.env                                                  | 2 +-
 .../components/Settings/SearchSettings/SearchSettings.tsx    | 2 +-
 client/src/store/reducers/config.ts                          | 1 +
 controllers/apps.js                                          | 5 ++++-
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.env b/.env
index feb0686..1bb2edb 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
 PORT=5005
 NODE_ENV=development
-VERSION=1.6.9
\ No newline at end of file
+VERSION=1.7.0
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85af84f..54c68e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,10 @@
-### v1.7.0 (TBA)
+### v1.7.0 (2021-10-11)
 - Search bar will now redirect if valid URL or IP is provided ([#67](https://github.com/pawelmalak/flame/issues/67))
+- Users can now add their custom search providers ([#71](https://github.com/pawelmalak/flame/issues/71))
 - Fixed bug related to creating new apps/bookmarks with custom icon ([#83](https://github.com/pawelmalak/flame/issues/83))
 - URL can now be assigned to notifications. Clicking on "New version is available" popup will now redirect to changelog ([#86](https://github.com/pawelmalak/flame/issues/86))
 - Added static fonts ([#94](https://github.com/pawelmalak/flame/issues/94))
+- Fixed bug with overriding app icon created with docker labels
 
 ### v1.6.9 (2021-10-09)
 - Added option for remote docker host ([#97](https://github.com/pawelmalak/flame/issues/97))
diff --git a/client/.env b/client/.env
index e9f8924..6dbe18b 100644
--- a/client/.env
+++ b/client/.env
@@ -1 +1 @@
-REACT_APP_VERSION=1.6.9
\ No newline at end of file
+REACT_APP_VERSION=1.7.0
\ No newline at end of file
diff --git a/client/src/components/Settings/SearchSettings/SearchSettings.tsx b/client/src/components/Settings/SearchSettings/SearchSettings.tsx
index 5b40f71..b2ac422 100644
--- a/client/src/components/Settings/SearchSettings/SearchSettings.tsx
+++ b/client/src/components/Settings/SearchSettings/SearchSettings.tsx
@@ -46,7 +46,7 @@ const SearchSettings = (props: Props): JSX.Element => {
   useEffect(() => {
     setFormData({
       hideSearch: searchConfig('hideSearch', 0),
-      defaultSearchProvider: searchConfig('defaultSearchProvider', 'd'),
+      defaultSearchProvider: searchConfig('defaultSearchProvider', 'l'),
       searchSameTab: searchConfig('searchSameTab', 0),
     });
   }, [props.loading]);
diff --git a/client/src/store/reducers/config.ts b/client/src/store/reducers/config.ts
index ac81aeb..ae2699e 100644
--- a/client/src/store/reducers/config.ts
+++ b/client/src/store/reducers/config.ts
@@ -17,6 +17,7 @@ const getConfig = (state: State, action: Action): State => {
   return {
     ...state,
     loading: false,
+    config: action.payload,
   };
 };
 
diff --git a/controllers/apps.js b/controllers/apps.js
index c2b065e..b976d45 100644
--- a/controllers/apps.js
+++ b/controllers/apps.js
@@ -131,7 +131,10 @@ exports.getApps = asyncWrapper(async (req, res, next) => {
         if (apps.some((app) => app.name === item.name)) {
           const app = apps.filter((e) => e.name === item.name)[0];
 
-          if (item.icon === 'custom' || (item.icon === 'docker' && app.icon != 'docker')) {
+          if (
+            item.icon === 'custom' ||
+            (item.icon === 'docker' && app.icon != 'docker')
+          ) {
             await app.update({
               name: item.name,
               url: item.url,