Skip to content

Commit

Permalink
Merge pull request #10543 from Expensify/OSBotify-cherry-pick-staging…
Browse files Browse the repository at this point in the history
…-10540

🍒 Cherry pick PR #10540 to staging 🍒
  • Loading branch information
OSBotify authored Aug 24, 2022
2 parents 24df24f + 938b7ad commit 8c4e9b1
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 9 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1001018900
versionName "1.1.89-0"
versionCode 1001018901
versionName "1.1.89-1"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()

if (isNewArchitectureEnabled()) {
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensify/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.1.89.0</string>
<string>1.1.89.1</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationQueriesSchemes</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensifyTests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.1.89.0</string>
<string>1.1.89.1</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
"version": "1.1.89-0",
"version": "1.1.89-1",
"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.",
Expand Down
11 changes: 10 additions & 1 deletion src/libs/Clipboard/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,17 @@ const setHtml = (html, text) => {
]);
};

/**
* Sets a string on the Clipboard object via react-native-web
*
* @param {String} text
*/
const setString = (text) => {
Clipboard.setString(text);
};

export default {
...Clipboard,
setString,
canSetHtml,
setHtml,
};
11 changes: 10 additions & 1 deletion src/libs/Clipboard/index.native.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
import Clipboard from '@react-native-community/clipboard';

/**
* Sets a string on the Clipboard object via @react-native-community/clipboard
*
* @param {String} text
*/
const setString = (text) => {
Clipboard.setString(text);
};

export default {
...Clipboard,
setString,

// We don't want to set HTML on native platforms so noop them.
canSetHtml: () => false,
Expand Down

0 comments on commit 8c4e9b1

Please sign in to comment.