Skip to content

Commit

Permalink
Rename the MissingPasswordHelpLink component to reflect its use
Browse files Browse the repository at this point in the history
  • Loading branch information
personalizedrefrigerator committed Aug 18, 2023
1 parent 67a5949 commit ca5b55a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import getDefaultPluginsInfo from '@joplin/lib/services/plugins/defaultPlugins/d
import JoplinCloudConfigScreen from '../JoplinCloudConfigScreen';
import ToggleAdvancedSettingsButton from './controls/ToggleAdvancedSettingsButton';
import shouldShowMissingPasswordWarning from '@joplin/lib/components/shared/config/shouldShowMissingPasswordWarning';
import MissingPasswordHelpLink from './controls/MissingPasswordHelpLink';
import MacOSMissingPasswordHelpLink from './controls/MissingPasswordHelpLink';
const { KeymapConfigScreen } = require('../KeymapConfig/KeymapConfigScreen');

const settingKeyToControl: any = {
Expand Down Expand Up @@ -193,7 +193,7 @@ class ConfigScreenComponent extends React.Component<any, any> {
<p key='missing-password-warning' style={warningStyle}>
{_('Warning: Missing password.')}
{' '}
<MissingPasswordHelpLink
<MacOSMissingPasswordHelpLink
theme={theme}
text={_('Help')}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const openMissingPasswordFAQ = () =>

// A link to a specific part of the FAQ related to passwords being cleared when upgrading
// to a MacOS/ARM release.
const MissingPasswordHelpLink: React.FunctionComponent<Props> = props => {
const MacOSMissingPasswordHelpLink: React.FunctionComponent<Props> = props => {
const macInfoLink = (
<StyledLink href="#"
onClick={openMissingPasswordFAQ}
Expand All @@ -32,4 +32,4 @@ const MissingPasswordHelpLink: React.FunctionComponent<Props> = props => {
return showMacInfoLink ? macInfoLink : null;
};

export default MissingPasswordHelpLink;
export default MacOSMissingPasswordHelpLink;
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import Setting from '@joplin/lib/models/Setting';
import CommandService from '@joplin/lib/services/CommandService';
import { PublicPrivateKeyPair } from '@joplin/lib/services/e2ee/ppk';
import ToggleAdvancedSettingsButton from '../ConfigScreen/controls/ToggleAdvancedSettingsButton';
import MissingPasswordHelpLink from '../ConfigScreen/controls/MissingPasswordHelpLink';
import MacOSMissingPasswordHelpLink from '../ConfigScreen/controls/MissingPasswordHelpLink';

interface Props {
themeId: any;
Expand Down Expand Up @@ -258,7 +258,7 @@ const EncryptionConfigScreen = (props: Props) => {
<br/>
{_('Please click on "%s" to proceed, or set the passwords in the "%s" list below.', buttonTitle, _('Encryption keys'))}
<br/>
<MissingPasswordHelpLink
<MacOSMissingPasswordHelpLink
theme={theme}
text={_('Help')}
/>
Expand Down

0 comments on commit ca5b55a

Please sign in to comment.