Skip to content

Commit 69fc219

Browse files
committed
Merge branch 'profile-share-tab-design-feedback' of https://github.com/status-im/status-mobile into profile-share-tab-design-feedback
2 parents af4fa28 + ec6a2d5 commit 69fc219

File tree

405 files changed

+9546
-6597
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

405 files changed

+9546
-6597
lines changed

.carve_ignore

+5-5
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,11 @@ status-im.hardwallet.simulated-keycard/sign-typed-data
9595
status-im.utils.core/safe-read-message-content
9696
status-im.ui.components.react/native-modules
9797
status-im.ui.components.react/progress-bar
98-
status-im.utils.fs/move-file
99-
status-im.utils.fs/read-dir
100-
status-im.utils.fs/mkdir
101-
status-im.utils.fs/unlink
102-
status-im.utils.fs/file-exists?
98+
react-native.fs/move-file
99+
react-native.fs/read-dir
100+
react-native.fs/mkdir
101+
react-native.fs/unlink
102+
react-native.fs/file-exists?
103103
quo.animated/code
104104
quo.animated/eq
105105
quo.animated/neq

.github/ISSUE_TEMPLATE/bug-report.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: MVPBug Report
33
about: MVPBug Report
44
title: ''
5-
labels: 'E:Mobile Bugfixes MVP'
5+
labels: 'E:Mobile Bug MVP'
66
assignees: ''
77

88
---

ci/Jenkinsfile.combined

+2-20
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ pipeline {
99
disableConcurrentBuilds()
1010
/* Prevent Jenkins jobs from running forever */
1111
timeout(time: 40, unit: 'MINUTES')
12-
/* Allow copying of artifacts from this job. */
13-
copyArtifactPermission('/status-mobile/e2e/*')
1412
/* Limit builds retained */
1513
buildDiscarder(logRotator(
1614
numToKeepStr: '10',
@@ -49,9 +47,6 @@ pipeline {
4947
stage('Android') { steps { script {
5048
apk = jenkins.Build('status-mobile/platforms/android')
5149
} } }
52-
stage('Android e2e') { steps { script {
53-
apke2e = jenkins.Build('status-mobile/platforms/android-e2e')
54-
} } }
5550
stage('Tests') { steps { script {
5651
jenkins.Build('status-mobile/platforms/tests')
5752
} } }
@@ -61,9 +56,7 @@ pipeline {
6156
steps { script {
6257
sh('rm -f pkg/*')
6358
jenkins.copyArts(ios)
64-
//jenkins.copyArts(iose2e)
6559
jenkins.copyArts(apk)
66-
jenkins.copyArts(apke2e)
6760
sha = "pkg/${utils.pkgFilename(ext: 'sha256')}"
6861
dir('pkg') {
6962
/* generate sha256 checksums for upload */
@@ -77,8 +70,8 @@ pipeline {
7770
/* object for easier URLs handling */
7871
urls = [
7972
/* mobile */
80-
Apk: utils.pkgUrl(apk), Apke2e: utils.pkgUrl(apke2e),
81-
iOS: utils.pkgUrl(ios), /*iOSe2e: utils.pkgUrl(iose2e),*/
73+
Apk: utils.pkgUrl(apk),
74+
iOS: utils.pkgUrl(ios),
8275
Diawi: utils.getEnv(ios, 'DIAWI_URL'),
8376
/* upload the sha256 checksums file too */
8477
SHA: s3.uploadArtifact(sha),
@@ -102,17 +95,6 @@ pipeline {
10295
}
10396
} }
10497
}
105-
stage('Run e2e') {
106-
when { expression { btype == 'nightly' && params.PUBLISH } }
107-
steps { script {
108-
e2eApk = utils.getEnv(apke2e, 'SAUCE_URL')
109-
build(
110-
job: 'status-mobile/e2e/status-app-nightly',
111-
parameters: [string(name: 'APK_URL', value: e2eApk)],
112-
wait: false
113-
)
114-
} }
115-
}
11698
}
11799
}
118100

ci/Jenkinsfile.e2e-nightly

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ pipeline {
55
agent { label 'linux' }
66

77
triggers {
8-
// Nightly at 4am
9-
cron 'H 4 * * *'
8+
// Nightly at 2am
9+
cron 'H 2 * * *'
1010
}
1111

1212
parameters {

ci/tests/Jenkinsfile.e2e-nightly

+17-8
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,24 @@ pipeline {
77

88
parameters {
99
string(
10-
name: 'APK_URL',
11-
description: 'URL of APK uploaded to SauceLabs.',
10+
name: 'APK_BUILD_NUMBER',
11+
description: 'platform/e2e build number for apk artifact',
1212
)
1313
string(
1414
name: 'KEYWORD_EXPRESSION',
1515
description: 'This will run tests which contain names that match the given string expression (Optional)',
1616
defaultValue: '',
1717
)
18+
string(
19+
name: 'BRANCH',
20+
description: 'Name of the branch to checkout and build.',
21+
defaultValue: 'develop',
22+
)
23+
string(
24+
name: 'TR_CASE_IDS',
25+
description: 'IDs of the TestRail case, separated by a comma (Optional)',
26+
defaultValue: '',
27+
)
1828
}
1929

2030
options {
@@ -23,15 +33,14 @@ pipeline {
2333

2434
stages {
2535
stage('Fetch') {
26-
when { expression { !params.APK_URL } }
2736
steps { script {
2837
copyArtifacts(
29-
projectName: "status-mobile/nightly",
30-
filter: '*-x86.apk',
31-
/* WARNING: This copies the latest available artifact. */
32-
selector: lastWithArtifacts(),
38+
projectName: "status-mobile/platforms/android-e2e",
39+
filter: 'result/*-x86.apk',
40+
selector: specific(env.APK_BUILD_NUMBER),
3341
)
34-
apk_path = "${env.WORKSPACE}/${utils.findFile('*-x86.apk')}"
42+
apk_path = "${env.WORKSPACE}/${utils.findFile('result/*-x86.apk')}"
43+
3544
} }
3645
}
3746

ci/tests/Jenkinsfile.e2e-nightly-build-number

-120
This file was deleted.

doc/decisions/0014-wallet-team.md

+4-5
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The responsibilities of the team are to implement the new wallet UI, with the su
1616

1717
## Decision
1818

19-
Some team members have already expressed interest and some have been asked and accepted to join the wallet team, these team members are:
19+
The team members for the initial wallet team are:
2020

2121
- @rasom
2222
- @OmarBasem
@@ -25,7 +25,6 @@ Some team members have already expressed interest and some have been asked and a
2525
- @briansztamfater
2626
- @smohamedjavid
2727
- @ulisesmac
28-
29-
# Follow-up Actions
30-
31-
- We still need 3/4 team members to join the wallet team
28+
- @erikseppanen
29+
- @mmilad75
30+
- @tumanov-alex

doc/decisions/0015-team-structure.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ The people identified for each sections are as follow:
3333

3434
- Messaging @flexsurfer, followed by @alwx
3535
- Syncing & Onboarding @siddarthkay
36-
- Communities @ilmotta
36+
- Communities @ilmotta, followed by @ajayesivan
3737
- Activity Center & Shell @J-Son89, followed by @Parveshdhull
3838
- Wallet (once the vertical team is created) @J-Son89, followed by @briansztamfater
3939

doc/images/figma-properties.png

72.4 KB
Loading

doc/images/quo-component.png

63.8 KB
Loading

doc/merging-pr-process.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ In practice, this means that sometimes they need to be merged in lockstep.
4040
git push origin vx.y.z
4141
```
4242
5) Update status-mobile with the new status-go version, using the new tag `scripts/update-status-go.sh "vx.y.z"`
43-
6) In status-mobile, push, rebase against `develop` and merge it 🚀
43+
6) If you had to rebase status-go to include new changes, e2e test MUST be re-run. If there's any issue you will
44+
have to fix in status-go with another PR and follow the same process.
45+
7) In status-mobile, push, rebase against `develop` and merge it 🚀
4446

4547

4648
important note : make sure your status-go PRs get a tested-ok by QA before merging them in.

0 commit comments

Comments
 (0)