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

Jump to bottom

chore: Update release branch 2.30.x #20938

Merged
merged 9 commits into from
Aug 2, 2024
Merged

chore: Update release branch 2.30.x #20938

merged 9 commits into from
Aug 2, 2024

Conversation

ilmotta
Copy link
Contributor

@ilmotta ilmotta commented Jul 31, 2024 •
edited
Loading

Cherry-picks (oldest first):

New changes from status-go release (oldest first)

Waiting

status: ready

smohamedjavid and others added 3 commits July 31, 2024 16:15
@smohamedjavid @ilmotta
fix(android): send and bridge ERC-20 tokens (#20924)
b81c057 
This commit adds the missing "encodeFunctionCall" method in Android

Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>
@briansztamfater @ilmotta
fix(wallet): inverted values of receiver and sender when displaying b…
991e5b0 
…ridging routes (#20893)

Signed-off-by: Brian Sztamfater <brian@status.im>
@briansztamfater @ilmotta
chore: bump react-native-camera-link version to Status fork to remove…
1ef53b9 
… usage of ML Kit (#20891)
@ilmotta ilmotta self-assigned this Jul 31, 2024
@ilmotta ilmotta changed the base branch from develop to release/2.30.x July 31, 2024 21:26
@ilmotta ilmotta marked this pull request as draft July 31, 2024 21:26
@status-im-auto
Copy link
Member

status-im-auto commented Jul 31, 2024 •
edited
Loading

Jenkins Builds

Click to see older builds (16)
❔ Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ a94d05e #2 2024-07-31 21:33:37 ~6 min tests 📄log
✔️ a94d05e #2 2024-07-31 21:37:20 ~10 min android-e2e 🤖apk 📲
✔️ a94d05e #2 2024-07-31 21:37:47 ~10 min android 🤖apk 📲
✔️ a94d05e #2 2024-07-31 21:39:24 ~12 min ios 📱ipa 📲
✔️ 58e0a6e #4 2024-07-31 21:54:33 ~5 min tests 📄log
✔️ 58e0a6e #4 2024-07-31 21:56:02 ~7 min android-e2e 🤖apk 📲
✔️ 58e0a6e #4 2024-07-31 21:56:27 ~7 min android 🤖apk 📲
✔️ 58e0a6e #4 2024-07-31 21:57:52 ~9 min ios 📱ipa 📲
✔️ 232bf53 #5 2024-08-01 20:08:27 ~5 min tests 📄log
✔️ 232bf53 #5 2024-08-01 20:10:35 ~8 min android 🤖apk 📲
✔️ 232bf53 #5 2024-08-01 20:11:13 ~8 min android-e2e 🤖apk 📲
✔️ 232bf53 #5 2024-08-01 20:11:24 ~8 min ios 📱ipa 📲
✔️ 6e2c806 #6 2024-08-01 22:37:00 ~4 min tests 📄log
✔️ 6e2c806 #6 2024-08-01 22:38:55 ~6 min android-e2e 🤖apk 📲
✔️ 6e2c806 #6 2024-08-01 22:40:15 ~7 min android 🤖apk 📲
✔️ 6e2c806 #6 2024-08-01 22:43:08 ~10 min ios 📱ipa 📲
❔ Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 2bcf0c3 #7 2024-08-02 10:15:28 ~5 min tests 📄log
✔️ 2bcf0c3 #7 2024-08-02 10:19:27 ~9 min android-e2e 🤖apk 📲
✔️ 2bcf0c3 #7 2024-08-02 10:20:50 ~10 min android 🤖apk 📲
✔️ 2bcf0c3 #7 2024-08-02 10:21:41 ~11 min ios 📱ipa 📲
✔️ 640e617 #8 2024-08-02 14:12:59 ~5 min tests 📄log
✔️ 640e617 #8 2024-08-02 14:16:28 ~9 min android-e2e 🤖apk 📲
✔️ 640e617 #8 2024-08-02 14:17:02 ~9 min ios 📱ipa 📲
✔️ 640e617 #8 2024-08-02 14:17:41 ~10 min android 🤖apk 📲

@ilmotta ilmotta force-pushed the ilmotta/update-release-2.30 branch from 0ada4b0 to 58e0a6e Compare July 31, 2024 21:48
@ilmotta ilmotta marked this pull request as ready for review July 31, 2024 21:49
@ilmotta ilmotta marked this pull request as draft July 31, 2024 22:55
@ilmotta
Copy link
Contributor Author

ilmotta commented Jul 31, 2024

@churik, let me know of any other commits we may need or add them directly in the PR description. The description has a section named Waiting where I added all the links for PRs that should be merged and/or available in status-go release branch before we merge this mobile PR.

@ilmotta ilmotta mentioned this pull request Aug 1, 2024
Closed
@churik
Copy link
Member

churik commented Aug 1, 2024

New one:
#20941

@ilmotta ilmotta force-pushed the ilmotta/update-release-2.30 branch from 232bf53 to 6e2c806 Compare August 1, 2024 22:32
@ilmotta
Copy link
Contributor Author

ilmotta commented Aug 2, 2024

@churik, do you think we need anything extra to be included in this PR, apart from #20931? I was thinking of merging this one now because we already accumulated quite a few commits in back/front repos.

@churik
Copy link
Member

churik commented Aug 2, 2024 •
edited
Loading

Also these PRs are ready:
#20942
#20945
#20926
#20943 (if the comments were addressed and no need to retest)

Yes, let's cherry pick these and merge this PR, and also please update status-go

@churik
Copy link
Member

churik commented Aug 2, 2024

And also this one, bugfix: #20852

@clauxx
Copy link
Member

clauxx commented Aug 2, 2024

@churik #20943 was merged and can be cherry-picked

@ilmotta ilmotta force-pushed the ilmotta/update-release-2.30 branch from 2bcf0c3 to 640e617 Compare August 2, 2024 14:06
@ilmotta ilmotta marked this pull request as ready for review August 2, 2024 14:08
@ilmotta ilmotta merged commit 05279c1 into release/2.30.x Aug 2, 2024
5 checks passed
@ilmotta ilmotta deleted the ilmotta/update-release-2.30 branch August 2, 2024 14:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@churik churik churik approved these changes

@jakubgs jakubgs Awaiting requested review from jakubgs jakubgs is a code owner

Assignees

@ilmotta ilmotta

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@ilmotta @status-im-auto @churik @clauxx @smohamedjavid @briansztamfater @ulisesmac @Parveshdhull @seanstrom