Skip to content

Commit cb78f55

Browse files
committed
LF-5318 Adjust sagas -- take the language from invite token
1 parent b6bb8e1 commit cb78f55

2 files changed

Lines changed: 5 additions & 8 deletions

File tree

packages/webapp/src/containers/Callback/index.jsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ function Callback() {
1717
dispatch(
1818
patchUserFarmStatus({
1919
invite_token: params.get('invite_token'),
20-
language: params.get('language'),
2120
}),
2221
);
2322
} else {

packages/webapp/src/containers/Callback/saga.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export function* validateResetTokenSaga({ payload: { reset_token } }) {
5050
export const patchUserFarmStatus = createAction('patchUserFarmStatusSaga');
5151

5252
export function* patchUserFarmStatusSaga({ payload }) {
53-
const { invite_token, language } = payload;
53+
const { invite_token } = payload;
5454
try {
5555
const result = yield call(
5656
axios.patch,
@@ -76,13 +76,11 @@ export function* patchUserFarmStatusSaga({ payload }) {
7676
history.push('/consent');
7777
} catch (e) {
7878
if (e?.response?.status === 404) {
79-
// and message === 'user does not exist
80-
console.log(e);
79+
// user does not exist yet; the invite token carries the sender's selected language
80+
const language = decodeToken(invite_token)?.language_preference || 'en';
8181
localStorage.setItem('litefarm_lang', language);
82-
const requestedLang = getLanguageFromLocalStorage();
83-
const targetLang = i18n.options.supportedLngs?.includes(requestedLang) ? requestedLang : 'en';
84-
if (i18n.language !== targetLang) {
85-
i18n.changeLanguage(targetLang);
82+
if (i18n.language !== language) {
83+
i18n.changeLanguage(language);
8684
}
8785
history.push('/accept_invitation/sign_up', invite_token);
8886
} else if (e?.response?.status === 401) {

0 commit comments

Comments
 (0)