From 8d34db4bbe5f92cb1d3e99691a77f6dbfeafa8b9 Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Wed, 24 Feb 2021 14:16:58 -0800 Subject: [PATCH] WIP --- app.json | 21 ++++++++++++------ assets/logo192noa.png | Bin 0 -> 9428 bytes .../screen-main/screen-main.component.jsx | 2 ++ util/document-upload.utility.js | 5 +++-- 4 files changed, 19 insertions(+), 9 deletions(-) create mode 100644 assets/logo192noa.png diff --git a/app.json b/app.json index 566e01b..74774bb 100644 --- a/app.json +++ b/app.json @@ -2,26 +2,33 @@ "expo": { "name": "imexmobile", "slug": "imexmobile", - "version": "1.0.2ØØ", + "version": "1.0.2", "orientation": "default", - "icon": "./assets/logo192.png", + "icon": "./assets/logo192noa.png", + "ios": { + "supportsTablet": true, + "bundleIdentifier": "com.imex.imexmobile", + "buildNumber": "1.0.0" + }, + "android": { + "package": "com.imex.imexmobile", + "versionCode": 1 + }, "splash": { "image": "./assets/logo1024.png", "resizeMode": "contain", "backgroundColor": "#efefef" }, "notification": { - "icon": "./assets/logo192.png" + "icon": "./assets/logo192noa.png" }, "updates": { "fallbackToCacheTimeout": 0 }, "assetBundlePatterns": ["**/*"], - "ios": { - "supportsTablet": true - }, + "web": { - "favicon": "./assets/logo192.png" + "favicon": "./assets/logo192noa.png" }, "description": "", "hooks": { diff --git a/assets/logo192noa.png b/assets/logo192noa.png new file mode 100644 index 0000000000000000000000000000000000000000..ff28f9a3a43f8e4cb4ddacbe6af9254898d425dd GIT binary patch literal 9428 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 I#X9tV02Wp)J^%m! literal 0 HcmV?d00001 diff --git a/components/screen-main/screen-main.component.jsx b/components/screen-main/screen-main.component.jsx index d70dd79..d989624 100644 --- a/components/screen-main/screen-main.component.jsx +++ b/components/screen-main/screen-main.component.jsx @@ -141,6 +141,8 @@ const BottomTabsNavigator = () => ( iconName = "ios-list"; } else if (route.name === "MessagingTab") { iconName = "ios-chatboxes"; + } else if (route.name === "MoreTab") { + iconName = "ios-settings"; } else if (route.name === "CameraTab") { iconName = "ios-camera"; } else if ( diff --git a/util/document-upload.utility.js b/util/document-upload.utility.js index 5c510f2..5362333 100644 --- a/util/document-upload.utility.js +++ b/util/document-upload.utility.js @@ -143,12 +143,13 @@ export const uploadToCloudinary = async ( variables: { docInput: [ { - jobid: jobId, + ...(jobId ? { jobid: jobId } : {}), + ...(billId ? { billid: billId } : {}), uploaded_by: uploaded_by, key: key, - billid: billId, type: fileType, extension: extension, + bodyshopid: bodyshop.id, }, ], },