Fixing undefined replacements and the prerequisite crashing

theoarav · Oct 6, 2023 · e091f6f · e091f6f
1 parent 2ea350b
commit e091f6f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "payday-3-challenge-viewer",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "Challenge viewer for Payday 3",
   "main": "./out/main/index.js",
   "author": "Elmoren",

diff --git a/src/renderer/src/components/challengeCard.components.tsx b/src/renderer/src/components/challengeCard.components.tsx
@@ -61,8 +61,8 @@ export default function ChallengeCard({
   }
 
   const sanitizedChallengeData: sanitizedChallengeData = $$(challenge.challenge.challengeId, language)
-  const challengeName = (sanitizedChallengeData.internalName !== "" ? sanitizedChallengeData.title : challenge.challenge.name).toUpperCase();
-  const challengeDesc = sanitizedChallengeData.internalName !== "" ? sanitizedChallengeData.desc : challenge.challenge.description;
+  const challengeName = ((sanitizedChallengeData.internalName !== "" && sanitizedChallengeData.title !== "undefined") ? sanitizedChallengeData.title : challenge.challenge.name).toUpperCase();
+  const challengeDesc = (sanitizedChallengeData.internalName !== "" && sanitizedChallengeData.desc !== "undefined") ? sanitizedChallengeData.desc : challenge.challenge.description;
 
   let borderColor
   switch (challenge.status) {

diff --git a/src/renderer/src/components/challenges.components.tsx b/src/renderer/src/components/challenges.components.tsx
@@ -65,7 +65,8 @@ export default function Challenges({ onLogout }) {
   useEffect(() => {
     const newFilteredChallenges = challenges.filter((ch) => {
       const sanitizedChallengeData: sanitizedChallengeData = $$(ch.challenge.challengeId, language)
-      const name = (sanitizedChallengeData.internalName !== "" ? sanitizedChallengeData.title : ch.challenge.name).toLowerCase();
+      const name = ((sanitizedChallengeData.internalName !== "" && sanitizedChallengeData.title !== "undefined") ? sanitizedChallengeData.title : ch.challenge.name).toLowerCase();
+
 
       //In case you want to reapply searching in descriptions also.
       //const description = ((internalizedChallenge && internalizedChallenge.game && internalizedChallenge.game.desc) ? internalizedChallenge.game.desc : ch.challenge.description).toLowerCase()

diff --git a/src/renderer/src/components/stringReplacer.components.tsx b/src/renderer/src/components/stringReplacer.components.tsx
@@ -38,10 +38,12 @@ export const $$ = (resourceKey: StringResourceKey, language: string): sanitizedC
     }
     else return { internalName: "", title: "", desc: ""};
 
+    let languageData = resource[language];
+
     let sanitizedValues: sanitizedChallengeData = {
       internalName: resource["internalName"],
-      title: resource[language].title,
-      desc: resource[language].desc,
+      title: (languageData && languageData.title && languageData.title !== undefined) ? languageData.title : "undefined",
+      desc: (languageData && languageData.desc && languageData.desc !== undefined) ? languageData.desc : "undefined",
     }
 
     return sanitizedValues;