fixed merge conflicts

Author: DerHighman

app.json

@@ -9,12 +9,16 @@
     "userInterfaceStyle": "light",
     "newArchEnabled": true,
     "splash": {
-      "image": "./assets/splash-icon.png",
+      "image": "./assets/app_icons/splash-icon.png",
       "resizeMode": "contain",
       "backgroundColor": "#ffffff"
     },
     "ios": {
-      "supportsTablet": true
+      "supportsTablet": true,
+      "icon": {
+        "dark": "./assets/app_icons/ios-dark.png",
+        "light": "./assets/app_icons/ios-light.png"
+      }
     },
     "plugins": [
       [
@@ -31,8 +35,8 @@
     ],
     "android": {
       "adaptiveIcon": {
-        "foregroundImage": "./assets/adaptive-icon.png",
-        "backgroundColor": "#ffffff"
+        "foregroundImage": "./assets/app_icons/adaptive-icon.png",
+        "backgroundColor": "#1C2435"
       },
       "edgeToEdgeEnabled": true,
       "permissions": [

assets/adaptive-icon.png

@@ -30,7 +30,7 @@ export default function InputComponent({ addMessage }) {
     } = useAudioRecorder({
         logger: console,
     })
-    
+
     /**
      * Reads the callsign from the filesystem.
      * @returns {string} - The callsign read from the file, or an empty string if the callsign has less than 3 characters.
@@ -44,6 +44,7 @@ export default function InputComponent({ addMessage }) {
             return callSign.length === 3 ? callSign : "";
         } catch (error) {
             console.error("Error reading callsign from file:", error);
+            return "";
         }
     }
 
@@ -61,7 +62,7 @@ export default function InputComponent({ addMessage }) {
             // This is done to ensure that the callsign is not displayed in the input field.
             const callSign = await readCallsignFromFile();
             const displayText = encodeText.trim().toUpperCase();
-            const morseText = callSign.length? "@" + callSign + ": " + encodeText : encodeText
+            const morseText = callSign.length === 3 ? `@${callSign}: ${encodeText}`: encodeText;
             const morse = await textToMorse(morseText);
 
             addMessage(displayText, morse, callSign, null, true, true);
@@ -122,7 +123,7 @@ export default function InputComponent({ addMessage }) {
             // If the text starts with a call sign in the format @XXX: , extract the call sign
             console.log(`InputComponent:handleStop: Evaluating ${text}`);
             if (text.match(/@[A-Z]{3}: /)) {
-                callSign = text.substring(1,4);
+                callSign = text.substring(1, 4);
                 text = text.substring(6);
             }
             console.log(`Callsign: ${callSign}, Text: ${text}`);