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

upgrade react-native-status-keycard to 2.5.19 #10072

Merged
merged 1 commit into from
Feb 25, 2020
Merged

upgrade react-native-status-keycard to 2.5.19 #10072

merged 1 commit into from
Feb 25, 2020

Conversation

jakubgs
Copy link
Member

@jakubgs jakubgs commented Feb 24, 2020 •
edited by StatusWrike
Loading

This fixes the following error encountered by @corpetty in #10059:

error: cannot update ref 'refs/heads/v2.5.17':
trying to write non-commit object 9ef49ef22471b0eceb3f4ad69b1eb3066a55ec3f
to branch 'refs/heads/v2.5.17

Which is caused most probably by someone force-pushing to v2.5.17 tag.
There exists a v2.5.18 but that tag points at an earlier commit than v2.5.17.

For that reason I've created a new v2.5.19 tag which points at the same commit as v2.5.17 but should at least solve the conflict caused by force pushing v2.5.17.

@jakubgs jakubgs requested a review from a team as a code owner February 24, 2020 18:30
@jakubgs jakubgs self-assigned this Feb 24, 2020
@dependency-lockfile-snitch
Copy link

mobile/js_files/yarn.lock changed. Pinging @jakubgs and @corpetty

@auto-assign auto-assign bot removed the request for review from a team February 24, 2020 18:30
@status-github-bot
Copy link

Pull Request Checklist

  • Docs: Updated the documentation, if affected
  • Docs: Added or updated inline comments explaining intention of the code
  • Tests: Ensured that all new UI elements have been assigned accessibility IDs
  • Tests: Signaled need for E2E tests with label, if applicable
  • Tests: Briefly described what was tested and what platforms were used
  • UI: In case of UI changes, ensured that UI matches Figma
  • UI: In case of UI changes, requested review from a Core UI designer
  • UI: In case of UI changes, included screenshots of implementation

@dependency-lockfile-snitch
Copy link

mobile/js_files/yarn.lock changed. Pinging @jakubgs and @corpetty

@status-im-auto
Copy link
Member

status-im-auto commented Feb 24, 2020 •
edited
Loading

Jenkins Builds

❔ Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ f319857 #2 2020-02-24 18:43:30 ~10 min ios 📦ipa 📲
✔️ f319857 #2 2020-02-24 18:50:08 ~16 min android-e2e 📦apk 📲
✔️ f319857 #2 2020-02-24 18:50:08 ~16 min android 📦apk 📲

@jakubgs
upgrade react-native-status-keycard to 2.5.18
e5f7a94 
This adds the exportKeyWithPath() method we use in:
src/status_im/hardwallet/card.cljs

Signed-off-by: Jakub Sokołowski <jakub@status.im>
@dependency-lockfile-snitch
Copy link

mobile/js_files/yarn.lock changed. Pinging @jakubgs and @corpetty

@jakubgs jakubgs merged commit e5f7a94 into develop Feb 25, 2020
@delete-merged-branch delete-merged-branch bot deleted the fix-card-export-key branch February 25, 2020 08:59
@weekly-digest weekly-digest bot mentioned this pull request Mar 1, 2020
Closed
@dependency-lockfile-snitch
Copy link

mobile/js_files/yarn.lock changed. Pinging @jakubgs and @corpetty

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rasom rasom rasom approved these changes

@corpetty corpetty corpetty approved these changes

@cammellos cammellos Awaiting requested review from cammellos

@yenda yenda Awaiting requested review from yenda

@flexsurfer flexsurfer Awaiting requested review from flexsurfer

Assignees
No one assigned
Labels
None yet
Projects
No open projects
Legacy QA Automation Project
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jakubgs @status-im-auto @rasom @corpetty