mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-11-02 05:42:26 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

[chore] Settings refactor fix 2 (#1357)

Browse source 
* fix emoji query tagging

* fix proxy url for gts instance

* fix: don't flash callback error on authorize flow
This commit is contained in:
f0x52 2023-01-18 16:41:00 +01:00 • committed by GitHub
commit 747683ba54
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 37 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

9
web/source/settings/components/authorization/index.jsx
View file

@ -28,17 +28,18 @@ const Loading = require("../loading");
const { Error } = require("../error");
module.exports = function Authorization({ App }) {
const loginState = Redux.useSelector((state) => state.oauth.loginState);
const [hasStoredLogin] = React.useState(loginState != "none" && loginState != "logout");
const { loginState, expectingRedirect } = Redux.useSelector((state) => state.oauth);
const { isLoading, isSuccess, data: account, error } = query.useVerifyCredentialsQuery(undefined, {
skip: loginState == "none" || loginState == "logout"
skip: loginState == "none" || loginState == "logout" || expectingRedirect
});
console.log("skip verify:", loginState, expectingRedirect);
let showLogin = true;
let content = null;
if (isLoading && hasStoredLogin) {
if (isLoading) {
showLogin = false;
let loadingInfo;