Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Mobile
Minds Mobile
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 180
    • Issues 180
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 10
    • Merge Requests 10
  • Security & Compliance
    • Security & Compliance
    • Dependency List
  • Packages
    • Packages
    • List
    • Container Registry
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
  • Minds
  • Minds MobileMinds Mobile
  • Merge Requests
  • !366

Merged
Opened 15 hours ago by Martin Santangelo@msantang78
  • Report abuse
Report abuse

[Sprint/NuancedNumbat] (fix) ETH wire wallet selector appears twice instead of private key decryption

closes #1342

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b "fix/eth-wire-wallet-selector-twice-decrypt" "origin/fix/eth-wire-wallet-selector-twice-decrypt"

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "origin/release/3.10.0"
git merge --no-ff "fix/eth-wire-wallet-selector-twice-decrypt"

Step 4. Push the result of the merge to GitLab

git push origin "release/3.10.0"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Request to merge fix/eth-wire-wallet-selector-twice-decrypt into release/3.10.0
  • Email patches
  • Plain diff
Could not retrieve the pipeline status. For troubleshooting steps, read the documentation.
Merge request approved. Approved by
Brian Hatchet
Brian Hatchet
Juan Manuel Solaro
Juan Manuel Solaro

Merged by Brian Hatchet 19 minutes ago

The changes were merged into release/3.10.0 with f224abb1

Merge failed: Merge request is not mergeable. Please try again.
Pipeline #84117073 running for f224abb1 on release/3.10.0
          • Discussion 0
          • Commits 1
          • Pipelines 1
          • Changes 1
          • Loading...
          • Martin Santangelo @msantang78 changed milestone to %Mobile 3.10 15 hours ago

            changed milestone to %Mobile 3.10

          • Martin Santangelo @msantang78 added MR::Awaiting Review Sprint::09/11 - Nuanced Numbat Squad::Green scoped labels 15 hours ago

            added MR::Awaiting Review Sprint::09/11 - Nuanced Numbat Squad::Green scoped labels

          • Juan Manuel Solaro @juanmsolaro approved this merge request 14 hours ago

            approved this merge request

          • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 19 minutes ago

            approved this merge request

          • Brian Hatchet :speech_balloon: @brianhatchet merged 19 minutes ago

            merged

          • Brian Hatchet :speech_balloon: @brianhatchet mentioned in commit f224abb1 19 minutes ago

            mentioned in commit f224abb1

          • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
          Please register or sign in to reply
          0 Assignees
          None
          Assign to
          Mobile 3.10
          Milestone
          Mobile 3.10
          Assign milestone
          None
          Time tracking
          No estimate or time spent
          3
          Labels
          MR::Awaiting Review Sprint::09/11 - Nuanced Numbat Squad::Green
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          3
          3 participants
          user avatar
          Brian Hatchet
          user avatar
          Juan Manuel Solaro
          user avatar
          Martin Santangelo
          Reference: minds/mobile-native!366

          Revert this merge request

          This will create a new commit in order to revert the existing changes.

          Switch branch
          Cancel
          A new branch will be created in your fork and a new merge request will be started.

          Cherry-pick this merge request

          Switch branch
          Cancel
          A new branch will be created in your fork and a new merge request will be started.