diff --git a/android/app/build.gradle b/android/app/build.gradle
index 61dfa156..3b0ea562 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -84,6 +84,7 @@ project.ext.react = [
     entryFile: "index.ts",
     enableHermes: true,  // clean and rebuild if changing
     extraPackagerArgs: ['--minify=false'],
+    // nodeExecutableAndArgs: ["/usr/local/bin/node"]
 ]
 
 apply from: "../../node_modules/react-native/react.gradle"
diff --git a/android/app/release/mSupplyColdChain-0_5_0-rc3-armeabi-v7a-release.apk b/android/app/release/mSupplyColdChain-0_5_0-rc3-armeabi-v7a-release.apk
deleted file mode 100644
index ce57e61e..00000000
Binary files a/android/app/release/mSupplyColdChain-0_5_0-rc3-armeabi-v7a-release.apk and /dev/null differ
diff --git a/android/app/src/main/assets/fonts/Feather.ttf b/android/app/src/main/assets/fonts/Feather.ttf
index 852c7135..a3c58c50 100644
Binary files a/android/app/src/main/assets/fonts/Feather.ttf and b/android/app/src/main/assets/fonts/Feather.ttf differ
diff --git a/android/app/src/main/assets/fonts/MaterialIcons.ttf b/android/app/src/main/assets/fonts/MaterialIcons.ttf
index 7015564a..e50801b3 100644
Binary files a/android/app/src/main/assets/fonts/MaterialIcons.ttf and b/android/app/src/main/assets/fonts/MaterialIcons.ttf differ
diff --git a/package.json b/package.json
index fbfb3078..d718cc9f 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,7 @@
     "react-native-gesture-handler": "1.6.1",
     "react-native-linear-gradient": "^2.5.6",
     "react-native-localize": "1.4.0",
-    "react-native-mail": "^6.1.0",
+    "react-native-mail": "^6.1.1",
     "react-native-modal": "^11.10.0",
     "react-native-permissions": "^2.2.2",
     "react-native-pin-view": "^3.0.1",
diff --git a/src/features/Report/ReportManager.ts b/src/features/Report/ReportManager.ts
index 45f7d5c8..5e1237f7 100644
--- a/src/features/Report/ReportManager.ts
+++ b/src/features/Report/ReportManager.ts
@@ -236,11 +236,14 @@ export class ReportManager {
           body: comment,
           attachments: [{ path, type: 'csv' }],
         },
-        () => {}
+        error => {
+          throw error;
+        }
       );
 
       return true;
     } catch (e) {
+      console.error('emailReport failed with error:', e);
       return false;
     }
   };
diff --git a/src/ui/components/modal/ExportDataModal.tsx b/src/ui/components/modal/ExportDataModal.tsx
index a48c7dad..3d911efe 100644
--- a/src/ui/components/modal/ExportDataModal.tsx
+++ b/src/ui/components/modal/ExportDataModal.tsx
@@ -1,7 +1,7 @@
 import React, { useRef, useCallback, FC } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { Input } from 'react-native-elements';
-import { useWindowDimensions, TextInput } from 'react-native';
+import { TextInput } from 'react-native';
 import { Formik } from 'formik';
 import * as Yup from 'yup';
 import { t } from '~translations';
@@ -29,7 +29,6 @@ export const ExportDataModal: FC<ExportDataModalProps> = ({
   variant = 'export',
 }) => {
   const formatter = useFormatter();
-  const { width } = useWindowDimensions();
   const dispatch = useDispatch();
   const { from, to } = useSelector(DetailSelector.fromTo);
 
diff --git a/yarn.lock b/yarn.lock
index bea84674..72ec08b3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13300,10 +13300,10 @@ react-native-localize@1.4.0:
   resolved "https://registry.yarnpkg.com/react-native-localize/-/react-native-localize-1.4.0.tgz#4653596d066d0941c48f5404dc1c0d08b6950443"
   integrity sha512-W2MQxm6hzD549ZbZcbWzWtYJseY7S7WR2WgsNhm9ULmbwP7tXFfOTbkJjQoqgPXYSXogKN3srXhntVsNZL0Ksw==
 
-react-native-mail@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/react-native-mail/-/react-native-mail-6.1.0.tgz#cd7fa390824f5d1182fbe0599d135d221d11d205"
-  integrity sha512-u2JqlHe19OKbXPKx3mNhBTuF7LfM4EkpVG/DkpY5i5G+dgOz8rRtBDKvcuJfUQnMBNav3kwvcwArjOG3rZhJZQ==
+react-native-mail@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/react-native-mail/-/react-native-mail-6.1.1.tgz#f1b1f8034c84d2510a93e4a2a795f0db5a13595e"
+  integrity sha512-pTs180wwyh7hN/iyTC9SfOX579U4YhDlHOLxi47IGvhPJENqO/QFdBq+wWKxyhNqdQuVSy+LoeIxLreWnIeYmg==
 
 react-native-modal@^11.10.0:
   version "11.10.0"