Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Frontend
Minds Frontend
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Dependency List
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 825
    • Issues 825
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 60
    • Merge Requests 60
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Registry
    • Registry
  • Packages
    • Packages
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Minds
  • Minds FrontendMinds Frontend
  • Merge Requests
  • !335

Open
Opened 1 week ago by Brian Hatchet@brianhatchet:speech_balloon:
  • Report abuse
Report abuse

(feature) Adding download metamask flow to /token

Before we display the terms checks, if the user has a local wallet, display the getmetamask component.

Cancelling it will resume the normal dialog.

Check out, review, and merge locally

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

git fetch https://gitlab.com/brianhatchet/front.git metamask_prompt_buy_token
git checkout -b brianhatchet/front-metamask_prompt_buy_token FETCH_HEAD

Step 2. Review the changes locally

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

git fetch origin
git checkout origin/master
git merge --no-ff brianhatchet/front-metamask_prompt_buy_token

Step 4. Push the result of the merge to GitLab

git push origin master

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 brianhatchet:metamask_prompt_buy_token into master
The source branch is 5 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #66816125 passed for 5f47fcd5 on brianhatchet:metamask_prompt_buy_token
    Requires approval from Devs. Approved by
    Ben Hayward
    Ben Hayward
    Emiliano Balbuena
    Emiliano Balbuena
    Marcelo Rivera
    Marcelo Rivera
    Martin Santangelo
    Martin Santangelo
    Mark Harding
    Mark Harding
    Ready to be merged automatically. Ask someone with write access to this repository to merge this request

    Allows commits from members who can merge to the target branch

    Deletes source branch

    • Discussion 3
    • Commits 4
    • Pipelines 3
    • Changes 1
    2/2 discussions resolved
    • Loading...
    • Brian Hatchet :speech_balloon: @brianhatchet changed milestone to %sprint: Giddy Giraffe 1 week ago

      changed milestone to %sprint: Giddy Giraffe

    • Brian Hatchet :speech_balloon: @brianhatchet mentioned in issue #1380 1 week ago

      mentioned in issue #1380

    • Marcelo Rivera @eiennohi approved this merge request 1 day ago

      approved this merge request

    • Ben Hayward
      Ben Hayward @benhayward.ben started a discussion on an old version of the diff 1 day ago
      Resolved by Brian Hatchet 1 day ago
    • Emiliano Balbuena @edgebal approved this merge request 1 day ago

      approved this merge request

    • Brian Hatchet :speech_balloon: @brianhatchet added 52 commits 1 day ago

      added 52 commits

      • ba2e6fa4...291c4e63 - 50 commits from branch minds:master
      • 57cd2896 - Merge remote-tracking branch 'upstream/master' into metamask_prompt_buy_token
      • 8a71fd1b - Merge remote-tracking branch 'upstream/master' into metamask_prompt_buy_token

      Compare with previous version

    • Brian Hatchet :speech_balloon: @brianhatchet added 1 commit 1 day ago

      added 1 commit

      • 5f47fcd5 - CR changes

      Compare with previous version

    • Brian Hatchet :speech_balloon: @brianhatchet resolved all discussions 1 day ago

      resolved all discussions

    • Ben Hayward @benhayward.ben approved this merge request 1 day ago

      approved this merge request

    • Mark Harding
      Mark Harding @markeharding started a discussion on the diff 9 hours ago
      Resolved by Brian Hatchet 2 minutes ago
    • Brian Hatchet :speech_balloon: @brianhatchet resolved all discussions 2 minutes ago

      resolved all discussions

    • 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
    Assignee
    Brian Hatchet's avatar Brian Hatchet @brianhatchet
    Assign to
    sprint: Giddy Giraffe
    Milestone
    sprint: Giddy Giraffe
    Assign milestone
    None
    Time tracking
    No estimate or time spent
    0
    Labels
    None
    Assign labels
    • View project labels
    Lock merge request
    Unlocked
    6
    6 participants
    user avatar
    Emiliano Balbuena
    user avatar
    Marcelo Rivera
    user avatar
    Martin Santangelo
    user avatar
    Mark Harding
    user avatar
    Brian Hatchet
    user avatar
    Ben Hayward
    Reference: minds/front!335