From 5cb4d9f861c2605fadb50460c47a52f84245b56f Mon Sep 17 00:00:00 2001 From: mashazyu Date: Sun, 9 Dec 2018 16:26:37 +0100 Subject: [PATCH 1/2] Fix export of empty database --- components/settings/export-dialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/settings/export-dialog.js b/components/settings/export-dialog.js index e87b9d2..9a8a669 100644 --- a/components/settings/export-dialog.js +++ b/components/settings/export-dialog.js @@ -8,7 +8,7 @@ export default async function openShareDialogAndExport() { try { data = getDataAsCsvDataUri() if (!data) { - return alertError(labels.errors.noData) + return alertError(labels.export.errors.noData) } } catch (err) { console.error(err) From 420befec36564398be0b72db2f0694e3f374d376 Mon Sep 17 00:00:00 2001 From: mashazyu Date: Sun, 9 Dec 2018 22:30:33 +0100 Subject: [PATCH 2/2] Fixes all export error messages --- components/settings/export-dialog.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/components/settings/export-dialog.js b/components/settings/export-dialog.js index 9a8a669..7104eba 100644 --- a/components/settings/export-dialog.js +++ b/components/settings/export-dialog.js @@ -1,14 +1,15 @@ import Share from 'react-native-share' import getDataAsCsvDataUri from '../../lib/import-export/export-to-csv' import alertError from './alert-error' -import { settings as labels } from '../../i18n/en/settings' +import { settings } from '../../i18n/en/settings' export default async function openShareDialogAndExport() { let data + const labels = settings.export try { data = getDataAsCsvDataUri() if (!data) { - return alertError(labels.export.errors.noData) + return alertError(labels.errors.noData) } } catch (err) { console.error(err) @@ -17,15 +18,15 @@ export default async function openShareDialogAndExport() { try { await Share.open({ - title: labels.export.title, + title: labels.title, url: data, - subject: labels.export.subject, + subject: labels.subject, type: 'text/csv', showAppsToView: true }) } catch (err) { console.error(err) - return alertError(labels.export.errors.problemSharing) + return alertError(labels.errors.problemSharing) } }