Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump react-native-mail #247

Merged
merged 4 commits into from
Oct 10, 2023
Merged

Bump react-native-mail #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
27ffea3
bump mail package version
mark-prins Aug 25, 2023
ff6d7de
bump version for testing
mark-prins Aug 25, 2023
a361f3c
resolve conflict
mark-prins Oct 10, 2023
1a74f11
Merge branch 'develop' into 245-unable-to-email
mark-prins Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Binary file removed android/app/release/mSupplyColdChain-0_5_0-rc3-armeabi-v7a-release.apk
View file
Open in desktop
Binary file not shown.
Binary file modified android/app/src/main/assets/fonts/Feather.ttf
View file
Open in desktop
Binary file not shown.
Binary file modified android/app/src/main/assets/fonts/MaterialIcons.ttf
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 4 additions & 1 deletion src/features/Report/ReportManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
};
Expand Down
3 changes: 1 addition & 2 deletions src/ui/components/modal/ExportDataModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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);

Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down