Merge pull request #511 from AnthonyHarwood/fse_err_msg_display_tweak

fse err msg display tweak
NuSkooler · Sep 29, 2023 · db8bd2f · db8bd2f
2 parents a644672 + 0161c22
commit db8bd2f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/core/fse.js b/core/fse.js
@@ -167,6 +167,7 @@ exports.FullScreenEditorModule =
                     var newFocusViewId;
                     if (errMsgView) {
                         if (err) {
+                            errMsgView.clearText();
                             errMsgView.setText(err.message);
 
                             if (MciViewIds.header.subject === err.view.getId()) {

diff --git a/core/ftn_address.js b/core/ftn_address.js
@@ -135,7 +135,7 @@ module.exports = class Address {
     static fromString(addrStr) {
         const m = FTN_ADDRESS_REGEXP.exec(addrStr);
 
-        if (m) {
+        if (m && m[2] && m[3]) {
             //  start with a 2D
             let addr = {
                 net: parseInt(m[2]),

diff --git a/core/system_view_validate.js b/core/system_view_validate.js
@@ -21,8 +21,10 @@ exports.validateEmailAvail = validateEmailAvail;
 exports.validateBirthdate = validateBirthdate;
 exports.validatePasswordSpec = validatePasswordSpec;
 
+const emptyFieldError = () => new Error('Field cannot be empty');
+
 function validateNonEmpty(data, cb) {
-    return cb(data && data.length > 0 ? null : new Error('Field cannot be empty'));
+    return cb(data && data.length > 0 ? null : emptyFieldError);
 }
 
 function validateMessageSubject(data, cb) {
@@ -91,7 +93,11 @@ function validateGeneralMailAddressedTo(data, cb) {
     //  :TODO: remove hard-coded FTN check here. We need a decent way to register global supported flavors with modules.
     const addressedToInfo = getAddressedToInfo(data);
 
-    if (Message.AddressFlavor.FTN === addressedToInfo.flavor) {
+    if (addressedToInfo.name.length === 0) {
+        return cb(emptyFieldError());
+    }
+
+    if (Message.AddressFlavor.Local !== addressedToInfo.flavor) {
         return cb(null);
     }