From 693553213027cb3139fd0319479ce2662214f451 Mon Sep 17 00:00:00 2001
From: SelfMadeSystem <sms@shoghisimon.cc>
Date: Thu, 7 Mar 2024 17:19:32 -0500
Subject: [PATCH 1/3] Improve ErrorBoundary component to  better display errors

---
 src/lib/ui/components/ErrorBoundary.tsx | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/lib/ui/components/ErrorBoundary.tsx b/src/lib/ui/components/ErrorBoundary.tsx
index e55a40c..debda61 100644
--- a/src/lib/ui/components/ErrorBoundary.tsx
+++ b/src/lib/ui/components/ErrorBoundary.tsx
@@ -6,10 +6,12 @@ import { FormText } from "@ui/components/discord/Forms";
 import { createThemedStyleSheet } from "@ui/styles";
 import { ScrollView } from "react-native";
 
-interface ErrorBoundaryState {
-    hasErr: boolean;
-    errText?: string;
-}
+type ErrorBoundaryState = {
+    hasErr: false;
+} | {
+    hasErr: true;
+    error: Error;
+};
 
 export interface ErrorBoundaryProps {
     children: JSX.Element | JSX.Element[];
@@ -34,7 +36,7 @@ export default class ErrorBoundary extends React.Component<ErrorBoundaryProps, E
         this.state = { hasErr: false };
     }
 
-    static getDerivedStateFromError = (error: Error) => ({ hasErr: true, errText: error.message });
+    static getDerivedStateFromError = (error: Error) => ({ hasErr: true, error });
 
     render() {
         if (!this.state.hasErr) return this.props.children;
@@ -42,12 +44,16 @@ export default class ErrorBoundary extends React.Component<ErrorBoundaryProps, E
         return (
             <ScrollView style={styles.view}>
                 <FormText style={styles.title}>{Strings.UH_OH}</FormText>
-                <Codeblock selectable style={{ marginBottom: 5 }}>{this.state.errText}</Codeblock>
+                <Codeblock selectable style={{ marginBottom: 5 }}>{this.state.error.name}</Codeblock>
+                <Codeblock selectable style={{ marginBottom: 5 }}>{this.state.error.message}</Codeblock>
+                {this.state.error.stack && <ScrollView style={{ maxHeight: 420, marginBottom: 5 }}>
+                    <Codeblock selectable>{this.state.error.stack}</Codeblock>
+                </ScrollView>}
                 <Button
                     color={Button.Colors.RED}
                     size={Button.Sizes.MEDIUM}
                     look={Button.Looks.FILLED}
-                    onPress={() => this.setState({ hasErr: false, errText: undefined })}
+                    onPress={() => this.setState({ hasErr: false })}
                     text={Strings.RETRY}
                 />
             </ScrollView>

From 6e1e4b5ea63c770779f852f14357ca28e170e33f Mon Sep 17 00:00:00 2001
From: SelfMadeSystem <sms@shoghisimon.cc>
Date: Thu, 7 Mar 2024 20:03:51 -0500
Subject: [PATCH 2/3] Fixed `SAFE_MODE_NOTICE_THEMES` i18n key

---
 src/core/i18n/default.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/i18n/default.json b/src/core/i18n/default.json
index bbf7d39..c0c3f8b 100644
--- a/src/core/i18n/default.json
+++ b/src/core/i18n/default.json
@@ -74,7 +74,7 @@
     "RETRY_RENDER": "Retry Render",
     "SAFE_MODE": "Safe Mode",
     "SAFE_MODE_NOTICE_PLUGINS": "You are in Safe Mode, so plugins cannot be loaded. Disable any misbehaving plugins, then return to Normal Mode from the General settings page.",
-    "SAFE_MODE_NOTICE_THEMES": "You are in Safe Mode, meaning themes have been temporarily disabled.{enabled, select, true { If a theme appears to be causing the issue, you can press below to disable it persistently.}}",
+    "SAFE_MODE_NOTICE_THEMES": "You are in Safe Mode, meaning themes have been temporarily disabled. {enabled, select, true { If a theme appears to be causing the issue, you can press below to disable it persistently.} false { }}",
     "SEARCH": "Search",
     "STACK_TRACE": "Stack Trace",
     "SUCCESSFULLY_INSTALLED": "Successfully installed",

From 244dcddb673225a30d867ca78f014439953896af Mon Sep 17 00:00:00 2001
From: pylixonly <82711525+amsyarasyiq@users.noreply.github.com>
Date: Fri, 8 Mar 2024 19:38:01 +0800
Subject: [PATCH 3/3] Remove trailing spaces

---
 src/core/i18n/default.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/i18n/default.json b/src/core/i18n/default.json
index c0c3f8b..f6a6889 100644
--- a/src/core/i18n/default.json
+++ b/src/core/i18n/default.json
@@ -74,7 +74,7 @@
     "RETRY_RENDER": "Retry Render",
     "SAFE_MODE": "Safe Mode",
     "SAFE_MODE_NOTICE_PLUGINS": "You are in Safe Mode, so plugins cannot be loaded. Disable any misbehaving plugins, then return to Normal Mode from the General settings page.",
-    "SAFE_MODE_NOTICE_THEMES": "You are in Safe Mode, meaning themes have been temporarily disabled. {enabled, select, true { If a theme appears to be causing the issue, you can press below to disable it persistently.} false { }}",
+    "SAFE_MODE_NOTICE_THEMES": "You are in Safe Mode, meaning themes have been temporarily disabled. {enabled, select, true {If a theme appears to be causing the issue, you can press below to disable it persistently.} false {}}",
     "SEARCH": "Search",
     "STACK_TRACE": "Stack Trace",
     "SUCCESSFULLY_INSTALLED": "Successfully installed",