From a3782805eb8e8c9fcee3519b9cfd4041c1f5ad61 Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Thu, 5 Sep 2024 01:30:20 +0700
Subject: [PATCH 1/2] fix app crash when clicking on got it button

---
 src/components/ImportColumn.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/ImportColumn.tsx b/src/components/ImportColumn.tsx
index f25082f94474..0693a6be65cb 100644
--- a/src/components/ImportColumn.tsx
+++ b/src/components/ImportColumn.tsx
@@ -156,7 +156,7 @@ function ImportColumn({column, columnName, columnRoles, columnIndex}: ImportColu
         text: item.text,
         value: item.value,
         description: item.description ?? (item.isRequired ? translate('common.required') : undefined),
-        isSelected: spreadsheet?.columns[columnIndex] === item.value,
+        isSelected: spreadsheet?.columns?.[columnIndex] === item.value,
     }));
 
     const columnValuesString = column.slice(containsHeader ? 1 : 0).join(', ');
@@ -176,7 +176,7 @@ function ImportColumn({column, columnName, columnRoles, columnIndex}: ImportColu
 
     return (
         <View style={[styles.importColumnCard, styles.mt4]}>
-            <Text style={[styles.textSupporting, styles.mw100]}>{columnHeader}</Text>
+            <Text style={styles.textSupporting}>{columnHeader}</Text>
             <View style={[styles.flexRow, styles.alignItemsCenter, styles.mt2]}>
                 <Text
                     numberOfLines={2}

From d439bedb97391381c9ed2def9d48fe4e5a550cec Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Thu, 5 Sep 2024 07:23:41 +0700
Subject: [PATCH 2/2] merge main

---
 src/components/ImportColumn.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ImportColumn.tsx b/src/components/ImportColumn.tsx
index 0693a6be65cb..6ede4ed490b0 100644
--- a/src/components/ImportColumn.tsx
+++ b/src/components/ImportColumn.tsx
@@ -176,7 +176,7 @@ function ImportColumn({column, columnName, columnRoles, columnIndex}: ImportColu
 
     return (
         <View style={[styles.importColumnCard, styles.mt4]}>
-            <Text style={styles.textSupporting}>{columnHeader}</Text>
+            <Text style={[styles.textSupporting, styles.mw100]}>{columnHeader}</Text>
             <View style={[styles.flexRow, styles.alignItemsCenter, styles.mt2]}>
                 <Text
                     numberOfLines={2}