Merge pull request #2560 from Expensify/main

Expensify · Apr 23, 2021 · 10c47e0 · 10c47e0
2 parents 5e80565 + 853bd90
commit 10c47e0
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 10 deletions.
diff --git a/.github/actions/markPullRequestsAsDeployed/action.yml b/.github/actions/markPullRequestsAsDeployed/action.yml
@@ -8,7 +8,7 @@ inputs:
         description: "Check if deploying to production"
         required: false
         default: "false"
-    VERSION:
+    DEPLOY_VERSION:
         description: "The app version in which the pull requests were deployed"
         required: true
     GITHUB_TOKEN:

diff --git a/.github/actions/markPullRequestsAsDeployed/index.js b/.github/actions/markPullRequestsAsDeployed/index.js
@@ -16,7 +16,7 @@ const prList = JSON.parse(core.getInput('PR_LIST', {required: true}));
 const isProd = JSON.parse(
     core.getInput('IS_PRODUCTION_DEPLOY', {required: true}),
 );
-const version = JSON.parse(core.getInput('VERSION', {required: true}));
+const version = JSON.parse(core.getInput('DEPLOY_VERSION', {required: true}));
 const token = core.getInput('GITHUB_TOKEN', {required: true});
 const octokit = github.getOctokit(token);
 const githubUtils = new GithubUtils(octokit);

diff --git a/.github/actions/markPullRequestsAsDeployed/markPullRequestsAsDeployed.js b/.github/actions/markPullRequestsAsDeployed/markPullRequestsAsDeployed.js
@@ -6,7 +6,7 @@ const prList = JSON.parse(core.getInput('PR_LIST', {required: true}));
 const isProd = JSON.parse(
     core.getInput('IS_PRODUCTION_DEPLOY', {required: true}),
 );
-const version = JSON.parse(core.getInput('VERSION', {required: true}));
+const version = JSON.parse(core.getInput('DEPLOY_VERSION', {required: true}));
 const token = core.getInput('GITHUB_TOKEN', {required: true});
 const octokit = github.getOctokit(token);
 const githubUtils = new GithubUtils(octokit);

diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
@@ -292,7 +292,7 @@ jobs:
         with:
           PR_LIST: ${{ steps.getReleasePRList.outputs.PR_LIST }}
           IS_PRODUCTION_DEPLOY: ${{ env.SHOULD_DEPLOY_PRODUCTION == 'true' }}
-          VERSION: ${{ env.VERSION }}
+          DEPLOY_VERSION: ${{ env.VERSION }}
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
           ANDROID: ${{ needs.android.result }}
           DESKTOP: ${{ needs.desktop.result }}

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -148,8 +148,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001002902
-        versionName "1.0.29-2"
+        versionCode 1001002903
+        versionName "1.0.29-3"
     }
     splits {
         abi {

diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.29.2</string>
+	<string>1.0.29.3</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.29.2</string>
+	<string>1.0.29.3</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "expensify.cash",
-  "version": "1.0.29-2",
+  "version": "1.0.29-3",
   "author": "Expensify, Inc.",
   "homepage": "https://expensify.cash",
   "description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

diff --git a/src/CONST.js b/src/CONST.js
@@ -16,6 +16,7 @@ const CONST = {
     PDF_VIEWER_URL: '/pdf/web/viewer.html',
     EXPENSIFY_ICON_URL: `${CLOUDFRONT_URL}/images/favicon-2019.png`,
     UPWORK_URL: 'https://www.upwork.com/ab/jobs/search/?q=Expensify%20React%20Native&user_location_match=2',
+    GITHUB_URL: 'https://github.com/Expensify/Expensify.cash',
     TERMS_URL: 'https://use.expensify.com/terms',
     PRIVACY_URL: 'https://use.expensify.com/privacy',
     LICENSES_URL: 'https://use.expensify.com/licenses',

diff --git a/src/pages/signin/SignInPageLayout/SignInPageLayoutNarrow.js b/src/pages/signin/SignInPageLayout/SignInPageLayoutNarrow.js
@@ -10,6 +10,8 @@ import ExpensifyCashLogo from '../../../../assets/images/expensify-cash.svg';
 import welcomeScreenshot from '../../../../assets/images/welcome-screenshot.png';
 import TermsAndLicenses from '../TermsAndLicenses';
 import WelcomeText from '../../../components/WelcomeText';
+import openURLInNewTab from '../../../libs/openURLInNewTab/index.native';
+import CONST from '../../../CONST';
 
 const propTypes = {
 
@@ -55,6 +57,27 @@ const SignInPageLayoutNarrow = props => (
                         )}
 
                     {props.shouldShowWelcomeText && <WelcomeText />}
+                    <View>
+                        <Text style={[styles.textLabel, styles.mt6]}>
+                            Expensify.cash is open source. View
+                            {' '}
+                            <Text
+                                style={[styles.link]}
+                                onPress={() => openURLInNewTab(CONST.GITHUB_URL)}
+                            >
+                                the code
+                            </Text>
+                            . View
+                            {' '}
+                            <Text
+                                style={[styles.link]}
+                                onPress={() => openURLInNewTab(CONST.UPWORK_URL)}
+                            >
+                                open jobs
+                            </Text>
+                            .
+                        </Text>
+                    </View>
                 </View>
                 <TermsAndLicenses />
             </View>

diff --git a/src/pages/signin/SignInPageLayout/SignInPageLayoutWide.js b/src/pages/signin/SignInPageLayout/SignInPageLayoutWide.js
@@ -9,6 +9,8 @@ import welcomeScreenshot from '../../../../assets/images/welcome-screenshot-wide
 import variables from '../../../styles/variables';
 import TermsAndLicenses from '../TermsAndLicenses';
 import WelcomeText from '../../../components/WelcomeText';
+import openURLInNewTab from '../../../libs/openURLInNewTab';
+import CONST from '../../../CONST';
 
 const propTypes = {
     // The children to show inside the layout
@@ -54,6 +56,27 @@ const SignInPageLayoutWide = props => (
                         <WelcomeText textSize="large" />
                     </View>
                     )}
+                <View>
+                    <Text style={[styles.textLabel]}>
+                        Expensify.cash is open source. View
+                        {' '}
+                        <Text
+                            style={[styles.link]}
+                            onPress={() => openURLInNewTab(CONST.GITHUB_URL)}
+                        >
+                            the code
+                        </Text>
+                        . View
+                        {' '}
+                        <Text
+                            style={[styles.link]}
+                            onPress={() => openURLInNewTab(CONST.UPWORK_URL)}
+                        >
+                            open jobs
+                        </Text>
+                        .
+                    </Text>
+                </View>
                 <TermsAndLicenses />
             </View>
         </View>