From 1b4bf3b8c3b9c8834d8ad734f207bcee87cf2416 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Mon, 28 Oct 2024 12:01:59 +0100
Subject: [PATCH] Rename Identity.formattedName to Identity.toString
---
dev/Model/Identity.js | 2 +-
dev/Settings/User/General.js | 2 +-
dev/View/Popup/Compose.js | 6 +++---
.../v/0.0.0/app/templates/Views/User/SettingsAccounts.html | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dev/Model/Identity.js b/dev/Model/Identity.js
index 66e5d0fbd..098a11ba4 100644
--- a/dev/Model/Identity.js
+++ b/dev/Model/Identity.js
@@ -40,7 +40,7 @@ export class IdentityModel extends EmailModel /*AbstractModel*/ {
/**
* @returns {string}
*/
- formattedName() {
+ toString() {
const name = this.name,
email = this.email,
label = this.label();
diff --git a/dev/Settings/User/General.js b/dev/Settings/User/General.js
index f06349c25..e5ac0ca71 100644
--- a/dev/Settings/User/General.js
+++ b/dev/Settings/User/General.js
@@ -122,7 +122,7 @@ export class UserSettingsGeneral extends AbstractViewSettings {
identityMainDesc: () => {
const identity = IdentityUserStore.main();
- return identity ? identity.formattedName() : '---';
+ return identity ? identity.toString() : '---';
},
editorDefaultTypes: () => {
diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js
index ca691df68..a30e3eb99 100644
--- a/dev/View/Popup/Compose.js
+++ b/dev/View/Popup/Compose.js
@@ -344,7 +344,7 @@ export class ComposePopupView extends AbstractViewPopup {
IdentityUserStore.map(item => ({
item: item,
optValue: item.id(),
- optText: item.formattedName()
+ optText: item
})),
canBeSentOrSaved: () => !this.sending() && !this.saving()
@@ -359,7 +359,7 @@ export class ComposePopupView extends AbstractViewPopup {
currentIdentity: value => {
if (value) {
- this.from(value.formattedName());
+ this.from(value.toString());
this.doEncrypt(value.pgpEncrypt() || SettingsUserStore.pgpEncrypt());
this.doSign(value.pgpSign() || SettingsUserStore.pgpSign());
}
@@ -455,7 +455,7 @@ export class ComposePopupView extends AbstractViewPopup {
contactsCommand: self => self.allowContacts
});
- this.from(IdentityUserStore()[0].formattedName());
+ this.from(IdentityUserStore()[0].toString());
}
sentFolder()
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html
index 1ae6846f6..9b5c1689c 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html
@@ -57,7 +57,7 @@
⬍
|
-
+
|
|