fix: Fix import config button crash

digidem · Feb 8, 2021 · 7ff3117 · 7ff3117
1 parent 53c5655
commit 7ff3117
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/frontend/screens/Settings/ProjectConfig.js b/src/frontend/screens/Settings/ProjectConfig.js
@@ -124,7 +124,7 @@ const ProjectConfig = () => {
         variant="outlined"
         onPress={handleImportPress}
       >
-        <FormattedMessage {...m.importConfig} />
+        {t(m.importConfig) /* Button component expects string children */}
       </Button>
     </View>
   );

diff --git a/src/frontend/sharedComponents/Button.js b/src/frontend/sharedComponents/Button.js
@@ -57,13 +57,16 @@ const Button = ({
         onPress={disabled ? undefined : onPress}
       >
         <View style={styles.touchable}>
-          {typeof children === "string" ? (
-            <Text style={[styles.textBase, textStyle]}>
-              {children.toUpperCase()}
-            </Text>
-          ) : (
-            children
-          )}
+          {
+            typeof children === "string" ? (
+              <Text style={[styles.textBase, textStyle]}>
+                {children.toUpperCase()}
+              </Text>
+            ) : (
+              children
+            )
+            // TODO: Handle <FormattedMessage> as children (wrapping in <Text>)
+          }
         </View>
       </TouchableNativeFeedback>
     </View>