Merge pull request #2533 from Bilb/settings-UI-fixes

fix: copy of in various dialogs

_locales/en/messages.json

@@ -276,7 +276,7 @@
   "enterPassword": "Please enter your password",
   "confirmPassword": "Confirm password",
   "enterNewPassword": "Please enter your new password",
-  "confirmNewPassword": "Confirm password",
+  "confirmNewPassword": "Confirm new password",
   "showRecoveryPhrasePasswordRequest": "Please enter your password",
   "recoveryPhraseSavePromptMain": "Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don't give it to anyone.",
   "invalidOpenGroupUrl": "Invalid URL",

ts/components/dialog/SessionPasswordDialog.tsx

@@ -68,6 +68,8 @@ export class SessionPasswordDialog extends React.Component<Props, State> {
 
     const confirmButtonColor =
       passwordAction === 'remove' ? SessionButtonColor.Danger : SessionButtonColor.Green;
+    const confirmButtonText =
+      passwordAction === 'remove' ? window.i18n('remove') : window.i18n('done');
     // do this separately so typescript's compiler likes it
     const localizedKeyAction: LocalizerKeys =
       passwordAction === 'change'
@@ -117,7 +119,7 @@ export class SessionPasswordDialog extends React.Component<Props, State> {
         <div className="session-modal__button-group">
           <SessionButton text={window.i18n('cancel')} onClick={this.closeDialog} />
           <SessionButton
-            text={window.i18n('done')}
+            text={confirmButtonText}
             buttonColor={confirmButtonColor}
             onClick={this.setPassword}
           />

ts/components/settings/section/CategoryPermissions.tsx

@@ -16,6 +16,7 @@ const toggleCallMediaPermissions = async (triggerUIUpdate: () => void) => {
         title: window.i18n('callMediaPermissionsDialogTitle'),
         message: window.i18n('callMediaPermissionsDialogContent'),
         okTheme: SessionButtonColor.Danger,
+        okText: window.i18n('continue'),
         onClickOk: async () => {
           await window.toggleCallMediaPermissionsTo(true);
           triggerUIUpdate();