Skip to content

Commit d0aef95

Browse files
authored
fix(piefed): native android connection issues, first login infinite spinner (#2054)
1 parent 42acdda commit d0aef95

File tree

4 files changed

+14
-20
lines changed

4 files changed

+14
-20
lines changed

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@
9696
"micromark-util-combine-extensions": "^2.0.1",
9797
"modern-screenshot": "^4.6.4",
9898
"motion": "^12.18.1",
99-
"openapi-fetch": "^0.14.0",
10099
"photoswipe": "^5.4.4",
101100
"react": "0.0.0-experimental-12bc60f5-20250613",
102101
"react-animate-height": "^3.2.3",
@@ -115,7 +114,7 @@
115114
"rehype-remark": "^10.0.1",
116115
"remark-parse": "^11.0.0",
117116
"remark-stringify": "^11.0.0",
118-
"threadiverse": "^0.2.4",
117+
"threadiverse": "^0.2.5",
119118
"ua-parser-js": "^2.0.3",
120119
"unified": "^11.0.5",
121120
"unist-util-visit": "^5.0.0",

pnpm-lock.yaml

Lines changed: 5 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/features/auth/authSlice.ts

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { getClient } from "#/services/client";
1818
import { AppDispatch, RootState } from "#/store";
1919

2020
import { getInstanceFromHandle, instanceSelector } from "./authSelectors";
21-
import { receivedSite, resetSite } from "./siteSlice";
21+
import { getSite, resetSite } from "./siteSlice";
2222

2323
const MULTI_ACCOUNT_STORAGE_NAME = "credentials";
2424

@@ -193,14 +193,10 @@ export const register =
193193

194194
export const addGuestInstance =
195195
(url: string) => async (dispatch: AppDispatch) => {
196-
const client = getClient(url);
197-
198-
const site = await client.getSite();
199-
200196
dispatch(resetAccountSpecificStoreData());
201-
dispatch(receivedSite(site));
202197
dispatch(addAccount({ handle: url }));
203198
dispatch(updateConnectedInstance(url));
199+
dispatch(getSite());
204200
};
205201

206202
const addJwt =
@@ -213,9 +209,9 @@ const addJwt =
213209
if (!myUser) throw new Error("broke");
214210

215211
dispatch(resetAccountSpecificStoreData());
216-
dispatch(receivedSite(site));
217212
dispatch(addAccount({ jwt, handle: getRemoteHandle(myUser) }));
218213
dispatch(updateConnectedInstance(parseLemmyJWT(jwt).iss));
214+
dispatch(getSite(site));
219215
};
220216

221217
const resetAccountSpecificStoreData = () => (dispatch: AppDispatch) => {

src/features/auth/siteSlice.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ export const getSiteIfNeeded =
107107
if (getState().site.response) return;
108108
if (getState().site.loading) return;
109109

110-
dispatch(getSoftware());
111110
dispatch(getSite());
112111
};
113112

@@ -133,14 +132,17 @@ export const getSoftware =
133132
};
134133

135134
export const getSite =
136-
() => async (dispatch: AppDispatch, getState: () => RootState) => {
135+
(existingSite?: GetSiteResponse) =>
136+
async (dispatch: AppDispatch, getState: () => RootState) => {
137+
dispatch(getSoftware());
138+
137139
const reqId = siteReqIdSelector(getState());
138140
let site;
139141

140142
dispatch(loadingSite());
141143

142144
try {
143-
site = await clientSelector(getState()).getSite();
145+
site = existingSite ?? (await clientSelector(getState()).getSite());
144146
} catch (error) {
145147
dispatch(failedSite());
146148

0 commit comments

Comments
 (0)