[chore] Settings refactor fix 2 (#1357)

* fix emoji query tagging

* fix proxy url for gts instance

* fix: don't flash callback error on authorize flow

2 files changed, 13 insertions, 9 deletions

diff --git a/web/source/settings/redux/index.js b/web/source/settings/redux/index.js
index 12b3db743..3b1cc5038 100644
--- a/web/source/settings/redux/index.js
+++ b/web/source/settings/redux/index.js
@@ -32,6 +32,7 @@ const {
 } = require("redux-persist");
 
 const query = require("../lib/query/base");
+const { Promise } = require("bluebird");
 
 const combinedReducers = combineReducers({
 	oauth: require("./oauth").reducer,
@@ -43,6 +44,14 @@ const persistedReducer = persistReducer({
 	storage: require("redux-persist/lib/storage").default,
 	stateReconciler: require("redux-persist/lib/stateReconciler/autoMergeLevel1").default,
 	whitelist: ["oauth"],
+	migrate: (state) => {
+		return Promise.try(() => {
+			if (state?.oauth != undefined) {
+				state.oauth.expectingRedirect = false;
+			}
+			return state;
+		});
+	}
 }, combinedReducers);
 
 const store = configureStore({
diff --git a/web/source/settings/redux/oauth.js b/web/source/settings/redux/oauth.js
index 081d4e508..efd872078 100644
--- a/web/source/settings/redux/oauth.js
+++ b/web/source/settings/redux/oauth.js
@@ -23,17 +23,12 @@ const { createSlice } = require("@reduxjs/toolkit");
 module.exports = createSlice({
 	name: "oauth",
 	initialState: {
-		loginState: 'none'
+		loginState: 'none',
+		expectingRedirect: false
 	},
 	reducers: {
-		setInstance: (state, { payload }) => {
-			return {
-				...state,
-				...payload /* overrides instance, registration keys */
-			};
-		},
-		authorize: (state) => {
-			state.loginState = "callback";
+		authorize: (state, { payload }) => {
+			return payload; // overrides state
 		},
 		setToken: (state, { payload }) => {
 			state.token = `${payload.token_type} ${payload.access_token}`;