From b5381bd99aa2a8ad4a4d1344f1588f3e51e22ffc Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Mon, 22 Aug 2022 06:56:26 -0400 Subject: [PATCH 1/2] Merge pull request #10472 from Expensify/version-BUILD-5BA869E9-17EF-4495-BC4C-1EB458CBBD9E Update version to 1.1.88-15 on main (cherry picked from commit 128ea378f2e1418140325c02f0b894ee60a8e53f) --- android/app/build.gradle | 4 +- ios/NewExpensify/Info.plist | 2 +- ios/NewExpensifyTests/Info.plist | 2 +- package-lock.json | 168 +++++++++++++++++++++++++++++-- package.json | 2 +- 5 files changed, 165 insertions(+), 13 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index e66eb85b43c..42655813d20 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -155,8 +155,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001018814 - versionName "1.1.88-14" + versionCode 1001018815 + versionName "1.1.88-15" buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() if (isNewArchitectureEnabled()) { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index da93dcd9256..09b449b53d8 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.1.88.14 + 1.1.88.15 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index aafe14f4d4a..fe107670ac7 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.1.88.14 + 1.1.88.15 diff --git a/package-lock.json b/package-lock.json index 5236972d87a..b1f860a7869 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,14 +1,166 @@ { "name": "new.expensify", - "version": "1.1.88-14", - "lockfileVersion": 1, + "version": "1.1.88-15", + "lockfileVersion": 2, "requires": true, - "dependencies": { - "7zip-bin": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-5.1.1.tgz", - "integrity": "sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ==", - "dev": true + "packages": { + "": { + "name": "new.expensify", + "version": "1.1.88-15", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "@expensify/react-native-web": "0.18.9", + "@formatjs/intl-getcanonicallocales": "^1.5.8", + "@formatjs/intl-locale": "^2.4.21", + "@formatjs/intl-numberformat": "^6.2.5", + "@formatjs/intl-pluralrules": "^4.0.13", + "@oguzhnatly/react-native-image-manipulator": "^1.0.5", + "@onfido/react-native-sdk": "github:Expensify/react-native-sdk#5d36f3128c4798a767782c8bc565ace30308edba", + "@pieter-pot/react-native-fast-image": "8.5.11", + "@react-native-async-storage/async-storage": "^1.17.7", + "@react-native-community/cameraroll": "git+https://github.com/react-native-cameraroll/react-native-cameraroll.git#3f0aed96db68e134f199171c7b06c1b4d6cb382b", + "@react-native-community/clipboard": "^1.5.1", + "@react-native-community/datetimepicker": "^3.5.2", + "@react-native-community/netinfo": "^8.3.0", + "@react-native-community/progress-bar-android": "^1.0.4", + "@react-native-community/progress-view": "^1.2.3", + "@react-native-firebase/analytics": "^12.3.0", + "@react-native-firebase/app": "^12.3.0", + "@react-native-firebase/crashlytics": "^12.3.0", + "@react-native-firebase/perf": "^12.3.0", + "@react-native-picker/picker": "^2.4.3", + "@react-navigation/drawer": "6.3.0", + "@react-navigation/native": "6.0.11", + "@react-navigation/stack": "6.2.2", + "babel-plugin-transform-remove-console": "^6.9.4", + "dom-serializer": "^0.2.2", + "domhandler": "^4.3.0", + "dotenv": "^8.2.0", + "expensify-common": "git+https://github.com/Expensify/expensify-common.git#e0ec0b9abca4d7b417ba0b016f8725856cfeeece", + "fbjs": "^3.0.2", + "file-loader": "^6.0.0", + "html-entities": "^1.3.1", + "htmlparser2": "^7.2.0", + "localforage": "^1.10.0", + "lodash": "4.17.21", + "memoize-one": "^6.0.0", + "metro-config": "^0.71.3", + "moment": "^2.29.4", + "moment-timezone": "^0.5.31", + "onfido-sdk-ui": "^8.1.0", + "prop-types": "^15.7.2", + "pusher-js": "^7.0.6", + "react": "18.0.0", + "react-collapse": "^5.1.0", + "react-content-loader": "^6.1.0", + "react-dom": "18.0.0", + "react-native": "npm:@expensify/react-native@0.69.4", + "react-native-blob-util": "^0.16.2", + "react-native-collapsible": "^1.6.0", + "react-native-config": "^1.4.5", + "react-native-document-picker": "^8.0.0", + "react-native-gesture-handler": "2.5.0", + "react-native-google-places-autocomplete": "git+https://github.com/Expensify/react-native-google-places-autocomplete.git#3bbd17d63e6c38d38d857b50f6037c1c0376ff06", + "react-native-haptic-feedback": "^1.13.0", + "react-native-image-pan-zoom": "^2.1.12", + "react-native-image-picker": "^4.8.5", + "react-native-image-size": "git+https://github.com/Expensify/react-native-image-size#6b5ab5110dc3ed554f8eafbc38d7d87c17147972", + "react-native-modal": "^13.0.0", + "react-native-onyx": "1.0.15", + "react-native-pdf": "^6.6.2", + "react-native-performance": "^2.0.0", + "react-native-permissions": "^3.0.1", + "react-native-picker-select": "git+https://github.com/Expensify/react-native-picker-select.git#7f09b2c15ffae320d769788f75bdf8948714bb10", + "react-native-plaid-link-sdk": "^7.2.0", + "react-native-reanimated": "2.9.1", + "react-native-render-html": "6.3.1", + "react-native-safe-area-context": "^3.1.4", + "react-native-screens": "^3.10.1", + "react-native-svg": "^12.1.0", + "react-native-webview": "^11.17.2", + "react-pdf": "5.7.2", + "react-plaid-link": "3.3.2", + "react-web-config": "^1.0.0", + "save": "^2.4.0", + "shim-keyboard-event-key": "^1.0.3", + "underscore": "^1.13.1", + "urbanairship-react-native": "^14.3.1" + }, + "devDependencies": { + "@actions/core": "^1.2.6", + "@actions/github": "5.0.3", + "@babel/core": "^7.11.1", + "@babel/plugin-proposal-class-properties": "^7.12.1", + "@babel/preset-env": "^7.11.0", + "@babel/preset-flow": "^7.12.13", + "@babel/preset-react": "^7.10.4", + "@babel/runtime": "^7.11.2", + "@octokit/core": "4.0.4", + "@octokit/plugin-paginate-rest": "3.1.0", + "@octokit/plugin-throttling": "4.1.0", + "@react-native-community/eslint-config": "3.0.0", + "@storybook/addon-a11y": "^6.5.9", + "@storybook/addon-essentials": "^6.5.9", + "@storybook/addon-react-native-web": "0.0.19--canary.37.cb55428.0", + "@storybook/addons": "^6.5.9", + "@storybook/react": "^6.5.9", + "@storybook/theming": "^6.5.9", + "@svgr/webpack": "^5.5.0", + "@testing-library/jest-native": "^3.4.2", + "@testing-library/react-native": "^7.0.2", + "@vercel/ncc": "^0.27.0", + "@welldone-software/why-did-you-render": "7.0.1", + "ajv-cli": "^5.0.0", + "babel-eslint": "^10.1.0", + "babel-jest": "^28.1.3", + "babel-loader": "^8.1.0", + "babel-plugin-module-resolver": "^4.0.0", + "babel-plugin-react-native-web": "^0.18.7", + "babel-plugin-transform-class-properties": "^6.24.1", + "babel-plugin-transform-remove-console": "^6.9.4", + "clean-webpack-plugin": "^3.0.0", + "concurrently": "^5.3.0", + "copy-webpack-plugin": "^6.0.3", + "css-loader": "^5.2.4", + "diff-so-fancy": "^1.3.0", + "electron": "^17.4.11", + "electron-builder": "23.3.1", + "electron-notarize": "^1.2.1", + "electron-reloader": "^1.2.1", + "eslint": "^7.6.0", + "eslint-config-expensify": "2.0.29", + "eslint-loader": "^4.0.2", + "eslint-plugin-jest": "^24.1.0", + "eslint-plugin-jsx-a11y": "^6.6.1", + "eslint-plugin-storybook": "^0.5.13", + "flipper-plugin-bridgespy-client": "^0.1.9", + "html-webpack-plugin": "^4.3.0", + "jest": "^26.6.3", + "jest-circus": "^26.6.3", + "jest-cli": "^26.6.3", + "metro-react-native-babel-preset": "^0.71.3", + "mock-fs": "^4.13.0", + "portfinder": "^1.0.28", + "pusher-js-mock": "^0.3.3", + "react-native-clean-project": "^4.0.0-alpha4.0", + "react-native-flipper": "https://gitpkg.now.sh/facebook/flipper/react-native/react-native-flipper?9cacc9b59402550eae866e0e81e5f0c2f8203e6b", + "react-native-performance-flipper-reporter": "^2.0.0", + "react-native-svg-transformer": "^0.14.3", + "react-test-renderer": "18.0.0", + "semver": "^7.3.4", + "style-loader": "^2.0.0", + "wait-port": "^0.2.9", + "webpack": "^4.44.1", + "webpack-bundle-analyzer": "^4.4.0", + "webpack-cli": "^3.3.12", + "webpack-dev-server": "^3.11.3", + "webpack-merge": "^5.1.1" + }, + "engines": { + "node": "16.15.1", + "npm": "8.11.0" + } }, "@actions/core": { "version": "1.2.6", diff --git a/package.json b/package.json index 4492ce23eae..edb03e577ed 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.88-14", + "version": "1.1.88-15", "author": "Expensify, Inc.", "homepage": "https://new.expensify.com", "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.", From 6a1e294f1344fe53b385a844e29bc0d2f88ec2fd Mon Sep 17 00:00:00 2001 From: Vivek Kumar <35863227+techievivek@users.noreply.github.com> Date: Mon, 22 Aug 2022 16:20:03 +0530 Subject: [PATCH 2/2] Merge pull request #10465 from kakajann/fix/attachment-preview-android fix: Attachment - PDF file is not shown in Preview Page (cherry picked from commit d9111320c6034fc054e06df7b585c969ea261af7) --- src/components/PDFView/index.native.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/PDFView/index.native.js b/src/components/PDFView/index.native.js index be24d7a35f4..1b8d3f48b03 100644 --- a/src/components/PDFView/index.native.js +++ b/src/components/PDFView/index.native.js @@ -33,6 +33,7 @@ const defaultProps = { const PDFView = props => ( } source={{uri: props.sourceURL}} style={[