From 9cf06721c851bbb783e5adc98ec8eb5e958ef07f Mon Sep 17 00:00:00 2001 From: Henry Heino Date: Mon, 14 Aug 2023 12:30:36 -0700 Subject: [PATCH 1/9] Desktop: MacOS: Add help link if missing encryption password --- .eslintignore | 1 + .gitignore | 1 + .../gui/ConfigScreen/ConfigScreen.tsx | 23 +++---------- .../controls/MissingPasswordHelpLink.tsx | 32 +++++++++++++++++++ .../EncryptionConfigScreen.tsx | 9 +++++- 5 files changed, 46 insertions(+), 20 deletions(-) create mode 100644 packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx diff --git a/.eslintignore b/.eslintignore index 0d0a1776b68..920e9702035 100644 --- a/.eslintignore +++ b/.eslintignore @@ -133,6 +133,7 @@ packages/app-desktop/gui/ClipperConfigScreen.js packages/app-desktop/gui/ConfigScreen/ButtonBar.js packages/app-desktop/gui/ConfigScreen/ConfigScreen.js packages/app-desktop/gui/ConfigScreen/Sidebar.js +packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.js packages/app-desktop/gui/ConfigScreen/controls/ToggleAdvancedSettingsButton.js packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.js packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginsStates.js diff --git a/.gitignore b/.gitignore index 08b45a60b77..c087fde1cc7 100644 --- a/.gitignore +++ b/.gitignore @@ -119,6 +119,7 @@ packages/app-desktop/gui/ClipperConfigScreen.js packages/app-desktop/gui/ConfigScreen/ButtonBar.js packages/app-desktop/gui/ConfigScreen/ConfigScreen.js packages/app-desktop/gui/ConfigScreen/Sidebar.js +packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.js packages/app-desktop/gui/ConfigScreen/controls/ToggleAdvancedSettingsButton.js packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.js packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginsStates.js diff --git a/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx b/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx index 53ba0cc9168..e729eabac60 100644 --- a/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx +++ b/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx @@ -21,8 +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 shim from '@joplin/lib/shim'; -import StyledLink from '../style/StyledLink'; +import MissingPasswordHelpLink from './controls/MissingPasswordHelpLink'; const { KeymapConfigScreen } = require('../KeymapConfig/KeymapConfigScreen'); const settingKeyToControl: any = { @@ -190,25 +189,11 @@ class ConfigScreenComponent extends React.Component { // saved yet). const matchesSavedTarget = settings['sync.target'] === this.props.settings['sync.target']; if (matchesSavedTarget && shouldShowMissingPasswordWarning(settings['sync.target'], settings)) { - const openMissingPasswordFAQ = () => - bridge().openExternal('https://joplinapp.org/faq#why-did-my-sync-and-encryption-passwords-disappear-after-updating-joplin'); - - const macInfoLink = ( - - {_('Help')} - - ); - - // The FAQ section related to missing passwords is specific to MacOS/ARM -- only show it - // in that case. - const showMacInfoLink = shim.isMac() && process.arch === 'arm64'; - settingComps.push(

- {_('Warning: Missing password.')}{' '}{showMacInfoLink ? macInfoLink : null} + {_('Warning: Missing password.')} + {' '} +

); } diff --git a/packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx b/packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx new file mode 100644 index 00000000000..3da20c67bf2 --- /dev/null +++ b/packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx @@ -0,0 +1,32 @@ +import * as React from 'react'; + +import shim from '@joplin/lib/shim'; +import bridge from '../../../bridge'; +import StyledLink from '../../style/StyledLink'; +import { _ } from '@joplin/lib/locale'; + +interface Props { + theme: any; +} + +const MissingPasswordHelpLink: React.FunctionComponent = props => { + const openMissingPasswordFAQ = () => + bridge().openExternal('https://joplinapp.org/faq#why-did-my-sync-and-encryption-passwords-disappear-after-updating-joplin'); + + const macInfoLink = ( + + {_('Help')} + + ); + + // The FAQ section related to missing passwords is specific to MacOS/ARM -- only show it + // in that case. + const showMacInfoLink = shim.isMac() && process.arch === 'arm64'; + + return showMacInfoLink ? macInfoLink : null; +}; + +export default MissingPasswordHelpLink; diff --git a/packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx b/packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx index 3add1187e75..c40db7ceabf 100644 --- a/packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx +++ b/packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx @@ -17,6 +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'; interface Props { themeId: any; @@ -252,7 +253,13 @@ const EncryptionConfigScreen = (props: Props) => { const buttonTitle = CommandService.instance().label('openMasterPasswordDialog'); const needPasswordMessage = !needMasterPassword ? null : ( -

{_('Your password is needed to decrypt some of your data.')}
{_('Please click on "%s" to proceed, or set the passwords in the "%s" list below.', buttonTitle, _('Encryption keys'))}

+

+ {_('Your password is needed to decrypt some of your data.')} +
+ {_('Please click on "%s" to proceed, or set the passwords in the "%s" list below.', buttonTitle, _('Encryption keys'))} +
+ +

); return ( From 7322c65c731258f2df7372204e6d6c9f41b2fa99 Mon Sep 17 00:00:00 2001 From: Henry Heino Date: Mon, 14 Aug 2023 12:57:36 -0700 Subject: [PATCH 2/9] Fix link not opening --- .../ConfigScreen/controls/MissingPasswordHelpLink.tsx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx b/packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx index 3da20c67bf2..b038b274ff8 100644 --- a/packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx +++ b/packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import shim from '@joplin/lib/shim'; -import bridge from '../../../bridge'; +import bridge from '../../../services/bridge'; import StyledLink from '../../style/StyledLink'; import { _ } from '@joplin/lib/locale'; @@ -9,10 +9,12 @@ interface Props { theme: any; } -const MissingPasswordHelpLink: React.FunctionComponent = props => { - const openMissingPasswordFAQ = () => - bridge().openExternal('https://joplinapp.org/faq#why-did-my-sync-and-encryption-passwords-disappear-after-updating-joplin'); +const openMissingPasswordFAQ = () => + bridge().openExternal('https://joplinapp.org/faq#why-did-my-sync-and-encryption-passwords-disappear-after-updating-joplin'); +// 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 => { const macInfoLink = ( Date: Mon, 14 Aug 2023 13:08:49 -0700 Subject: [PATCH 3/9] Use different link text in different places --- packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx | 5 ++++- .../gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx | 4 ++-- .../gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx | 5 ++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx b/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx index e729eabac60..633dc7500db 100644 --- a/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx +++ b/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx @@ -193,7 +193,10 @@ class ConfigScreenComponent extends React.Component {

{_('Warning: Missing password.')} {' '} - +

); } diff --git a/packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx b/packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx index b038b274ff8..d7e7ec9b179 100644 --- a/packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx +++ b/packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx @@ -3,10 +3,10 @@ import * as React from 'react'; import shim from '@joplin/lib/shim'; import bridge from '../../../services/bridge'; import StyledLink from '../../style/StyledLink'; -import { _ } from '@joplin/lib/locale'; interface Props { theme: any; + text: string; } const openMissingPasswordFAQ = () => @@ -20,7 +20,7 @@ const MissingPasswordHelpLink: React.FunctionComponent = props => { onClick={openMissingPasswordFAQ} style={props.theme.linkStyle} > - {_('Help')} + {props.text} ); diff --git a/packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx b/packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx index c40db7ceabf..73ea02ffbbb 100644 --- a/packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx +++ b/packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx @@ -258,7 +258,10 @@ const EncryptionConfigScreen = (props: Props) => {
{_('Please click on "%s" to proceed, or set the passwords in the "%s" list below.', buttonTitle, _('Encryption keys'))}
- +

); From 67a594953a5cc48b3b3f668925ced35d241d69c1 Mon Sep 17 00:00:00 2001 From: Henry Heino Date: Fri, 18 Aug 2023 12:06:35 -0700 Subject: [PATCH 4/9] Only show the missing password help link if the new MacOS arch was recently released --- .../gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx | 3 ++- .../gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx b/packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx index d7e7ec9b179..f7debc4b091 100644 --- a/packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx +++ b/packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx @@ -26,7 +26,8 @@ const MissingPasswordHelpLink: React.FunctionComponent = props => { // The FAQ section related to missing passwords is specific to MacOS/ARM -- only show it // in that case. - const showMacInfoLink = shim.isMac() && process.arch === 'arm64'; + const newArchitectureReleasedRecently = Date.now() <= Date.UTC(2023, 10); // 10 = November + const showMacInfoLink = shim.isMac() && process.arch === 'arm64' && newArchitectureReleasedRecently; return showMacInfoLink ? macInfoLink : null; }; diff --git a/packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx b/packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx index 73ea02ffbbb..3875ba0ee48 100644 --- a/packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx +++ b/packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx @@ -260,7 +260,7 @@ const EncryptionConfigScreen = (props: Props) => {

); From ca5b55a2e5fac832b09c53f5e3c8dce45d73df4c Mon Sep 17 00:00:00 2001 From: Henry Heino Date: Fri, 18 Aug 2023 12:08:02 -0700 Subject: [PATCH 5/9] Rename the MissingPasswordHelpLink component to reflect its use --- packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx | 4 ++-- .../gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx | 4 ++-- .../gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx b/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx index 633dc7500db..3abd115d323 100644 --- a/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx +++ b/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx @@ -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 = { @@ -193,7 +193,7 @@ class ConfigScreenComponent extends React.Component {

{_('Warning: Missing password.')} {' '} - diff --git a/packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx b/packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx index f7debc4b091..6d30c74b9a9 100644 --- a/packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx +++ b/packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx @@ -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 => { +const MacOSMissingPasswordHelpLink: React.FunctionComponent = props => { const macInfoLink = ( = props => { return showMacInfoLink ? macInfoLink : null; }; -export default MissingPasswordHelpLink; +export default MacOSMissingPasswordHelpLink; diff --git a/packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx b/packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx index 3875ba0ee48..d9c47eae6a4 100644 --- a/packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx +++ b/packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx @@ -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; @@ -258,7 +258,7 @@ const EncryptionConfigScreen = (props: Props) => {
{_('Please click on "%s" to proceed, or set the passwords in the "%s" list below.', buttonTitle, _('Encryption keys'))}
- From 1f858039fe63ef15f9848cd8e5003b1ef492115c Mon Sep 17 00:00:00 2001 From: Henry Heino Date: Fri, 18 Aug 2023 12:15:16 -0700 Subject: [PATCH 6/9] Remove unnecessary prop --- packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx | 5 +---- .../gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx | 4 ++-- .../gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx | 5 +---- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx b/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx index 3abd115d323..f6d47a99b04 100644 --- a/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx +++ b/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx @@ -193,10 +193,7 @@ class ConfigScreenComponent extends React.Component {

{_('Warning: Missing password.')} {' '} - +

); } diff --git a/packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx b/packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx index 6d30c74b9a9..c5138d4550b 100644 --- a/packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx +++ b/packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx @@ -3,10 +3,10 @@ import * as React from 'react'; import shim from '@joplin/lib/shim'; import bridge from '../../../services/bridge'; import StyledLink from '../../style/StyledLink'; +import { _ } from '@joplin/lib/locale'; interface Props { theme: any; - text: string; } const openMissingPasswordFAQ = () => @@ -20,7 +20,7 @@ const MacOSMissingPasswordHelpLink: React.FunctionComponent = props => { onClick={openMissingPasswordFAQ} style={props.theme.linkStyle} > - {props.text} + {_('Help')} ); diff --git a/packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx b/packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx index d9c47eae6a4..5f1a7fc844a 100644 --- a/packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx +++ b/packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx @@ -258,10 +258,7 @@ const EncryptionConfigScreen = (props: Props) => {
{_('Please click on "%s" to proceed, or set the passwords in the "%s" list below.', buttonTitle, _('Encryption keys'))}
- +

); From 1da251c21240944fbafc7552278190710fe11a72 Mon Sep 17 00:00:00 2001 From: Henry Heino Date: Fri, 18 Aug 2023 12:18:26 -0700 Subject: [PATCH 7/9] Revert "Remove unnecessary prop" This reverts commit 1f858039fe63ef15f9848cd8e5003b1ef492115c. --- packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx | 5 ++++- .../gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx | 4 ++-- .../gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx | 5 ++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx b/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx index f6d47a99b04..3abd115d323 100644 --- a/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx +++ b/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx @@ -193,7 +193,10 @@ class ConfigScreenComponent extends React.Component {

{_('Warning: Missing password.')} {' '} - +

); } diff --git a/packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx b/packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx index c5138d4550b..6d30c74b9a9 100644 --- a/packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx +++ b/packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx @@ -3,10 +3,10 @@ import * as React from 'react'; import shim from '@joplin/lib/shim'; import bridge from '../../../services/bridge'; import StyledLink from '../../style/StyledLink'; -import { _ } from '@joplin/lib/locale'; interface Props { theme: any; + text: string; } const openMissingPasswordFAQ = () => @@ -20,7 +20,7 @@ const MacOSMissingPasswordHelpLink: React.FunctionComponent = props => { onClick={openMissingPasswordFAQ} style={props.theme.linkStyle} > - {_('Help')} + {props.text} ); diff --git a/packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx b/packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx index 5f1a7fc844a..d9c47eae6a4 100644 --- a/packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx +++ b/packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx @@ -258,7 +258,10 @@ const EncryptionConfigScreen = (props: Props) => {
{_('Please click on "%s" to proceed, or set the passwords in the "%s" list below.', buttonTitle, _('Encryption keys'))}
- +

); From 819c1dcc3cb09095079b268f2d8c89d8fdb7abe6 Mon Sep 17 00:00:00 2001 From: Henry Heino Date: Fri, 18 Aug 2023 12:24:26 -0700 Subject: [PATCH 8/9] Restructure localization formatting --- packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx | 2 +- .../gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx b/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx index 3abd115d323..76747886714 100644 --- a/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx +++ b/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx @@ -191,7 +191,7 @@ class ConfigScreenComponent extends React.Component { if (matchesSavedTarget && shouldShowMissingPasswordWarning(settings['sync.target'], settings)) { settingComps.push(

- {_('Warning: Missing password.')} + {_('%s: Missing password.', _('Warning'))} {' '} {

); From 9cdee3c43800a82a6740133dc428c706bd4402f1 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Sat, 19 Aug 2023 09:16:40 +0100 Subject: [PATCH 9/9] Update MissingPasswordHelpLink.tsx --- .../gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx b/packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx index 6d30c74b9a9..8c496aa3fb3 100644 --- a/packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx +++ b/packages/app-desktop/gui/ConfigScreen/controls/MissingPasswordHelpLink.tsx @@ -26,7 +26,7 @@ const MacOSMissingPasswordHelpLink: React.FunctionComponent = props => { // The FAQ section related to missing passwords is specific to MacOS/ARM -- only show it // in that case. - const newArchitectureReleasedRecently = Date.now() <= Date.UTC(2023, 10); // 10 = November + const newArchitectureReleasedRecently = Date.now() <= Date.UTC(2023, 11); // 11 = December const showMacInfoLink = shim.isMac() && process.arch === 'arm64' && newArchitectureReleasedRecently; return showMacInfoLink ? macInfoLink : null;