From 6093c3ec0f77f4246835f99bca777ba0750d7f7b Mon Sep 17 00:00:00 2001
From: Gregor MacLennan <gmaclennan@digital-democracy.org>
Date: Thu, 11 Feb 2021 12:23:25 +0000
Subject: [PATCH] fix: Fix import config button crash (#512)

* fix: Fix import config button crash

* Update version in package-lock

Co-authored-by: luandro <luandro@gmail.com>
---
 package-lock.json                              |  2 +-
 src/frontend/screens/Settings/ProjectConfig.js |  2 +-
 src/frontend/sharedComponents/Button.js        | 17 ++++++++++-------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b976974b3..fcd8b1b70 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "mapeo-mobile",
-  "version": "5.0.3",
+  "version": "5.1.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/src/frontend/screens/Settings/ProjectConfig.js b/src/frontend/screens/Settings/ProjectConfig.js
index 71881c10e..e4a6542b7 100644
--- 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
index 9ca2f0cc6..36198671f 100644
--- 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>