Patch for "7839bbf2: Fix language-change not applied to all components immediately"
- Missed the "Account Password" card that is used for authenticated case. - For cards that are only used in Settings, listen to the language change in "select" instead of passing in as a prop. I think this is cleaner.
This commit is contained in:
parent
f50eb2b5ab
commit
1a3669ca76
4 changed files with 7 additions and 2 deletions
|
@ -1,13 +1,16 @@
|
|||
import { connect } from 'react-redux';
|
||||
import { selectUser, selectPasswordSetSuccess, selectPasswordSetError } from 'redux/selectors/user';
|
||||
import { makeSelectClientSetting } from 'redux/selectors/settings';
|
||||
import { doUserPasswordSet, doClearPasswordEntry } from 'redux/actions/user';
|
||||
import { doToast } from 'redux/actions/notifications';
|
||||
import UserSignIn from './view';
|
||||
import * as SETTINGS from 'constants/settings';
|
||||
|
||||
const select = state => ({
|
||||
user: selectUser(state),
|
||||
passwordSetSuccess: selectPasswordSetSuccess(state),
|
||||
passwordSetError: selectPasswordSetError(state),
|
||||
language: makeSelectClientSetting(SETTINGS.LANGUAGE)(state),
|
||||
});
|
||||
|
||||
export default connect(select, {
|
||||
|
|
|
@ -7,6 +7,7 @@ import SettingAutoLaunch from './view';
|
|||
|
||||
const select = state => ({
|
||||
autoLaunch: makeSelectClientSetting(SETTINGS.AUTO_LAUNCH)(state),
|
||||
language: makeSelectClientSetting(SETTINGS.LANGUAGE)(state),
|
||||
});
|
||||
|
||||
const perform = dispatch => ({
|
||||
|
|
|
@ -10,6 +10,7 @@ const select = state => ({
|
|||
syncEnabled: makeSelectClientSetting(SETTINGS.ENABLE_SYNC)(state),
|
||||
verifiedEmail: selectUserVerifiedEmail(state),
|
||||
getSyncError: selectGetSyncErrorMessage(state),
|
||||
language: makeSelectClientSetting(SETTINGS.LANGUAGE)(state),
|
||||
});
|
||||
|
||||
const perform = dispatch => ({
|
||||
|
|
|
@ -279,7 +279,7 @@ class SettingsPage extends React.PureComponent<Props, State> {
|
|||
? __("To enable this feature, check 'Save Password' the next time you start the app.")
|
||||
: null
|
||||
}
|
||||
actions={<SyncToggle language={language} disabled={walletEncrypted && !storedPassword} />}
|
||||
actions={<SyncToggle disabled={walletEncrypted && !storedPassword} />}
|
||||
/>
|
||||
<Card
|
||||
title={__('Download Directory')}
|
||||
|
@ -792,7 +792,7 @@ class SettingsPage extends React.PureComponent<Props, State> {
|
|||
|
||||
{/* @if TARGET='app' */}
|
||||
{/* Auto launch in a hidden state doesn't work on mac https://github.com/Teamwork/node-auto-launch/issues/81 */}
|
||||
{!IS_MAC && <Card title={__('Startup Preferences')} actions={<SettingAutoLaunch language={language} />} />}
|
||||
{!IS_MAC && <Card title={__('Startup Preferences')} actions={<SettingAutoLaunch />} />}
|
||||
{/* @endif */}
|
||||
|
||||
<Card
|
||||
|
|
Loading…
Reference in a new issue