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

🍒 Cherry pick PR #11831 to staging 🍒 #11833

Merged
merged 2 commits into from
Oct 13, 2022
Merged

🍒 Cherry pick PR #11831 to staging 🍒 #11833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21e860a
Merge pull request #11832 from Expensify/version-BUILD-B38566C8-5FBD-…
OSBotify Oct 13, 2022
cd4c592
Merge pull request #11831 from Expensify/amechler-properly-generate-p…
Luke9389 Oct 13, 2022
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
4 changes: 2 additions & 2 deletions android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1001021500
versionName "1.2.15-0"
versionCode 1001021501
versionName "1.2.15-1"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()

if (isNewArchitectureEnabled()) {
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensify/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.2.15.0</string>
<string>1.2.15.1</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationQueriesSchemes</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensifyTests/Info.plist
View file
Open in desktop
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.2.15.0</string>
<string>1.2.15.1</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
"version": "1.2.15-0",
"version": "1.2.15-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
7 changes: 4 additions & 3 deletions src/libs/actions/Policy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,10 +715,11 @@ function clearDeleteWorkspaceError(policyID) {

/**
* Generate a policy name based on an email and policy list.
* @param {String} [email] the email to base the workspace name on. If not passed, will use the logged in user's email instead
* @returns {String}
*/
function generateDefaultWorkspaceName() {
const emailParts = sessionEmail.split('@');
function generateDefaultWorkspaceName(email = '') {
const emailParts = email ? email.split('@') : sessionEmail.split('@');
let defaultWorkspaceName = '';
if (!emailParts || emailParts.length !== 2) {
return defaultWorkspaceName;
Expand Down Expand Up @@ -769,7 +770,7 @@ function generatePolicyID() {
*/
function createWorkspace(ownerEmail = '', makeMeAdmin = false) {
const policyID = generatePolicyID();
const workspaceName = generateDefaultWorkspaceName();
const workspaceName = generateDefaultWorkspaceName(ownerEmail);

const {
announceChatReportID,
Expand Down