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 833
    • Issues 833
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 44
    • Merge Requests 44
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Packages
    • Packages
    • List
    • Container Registry
  • 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
  • !461

Open
Opened 1 day ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

[Sprint/JollyJellyfish](chore): Added in US only text

image

Decided to do it in the title so it isn't messing with mobile.

Check out, review, and merge locally

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

git fetch origin
git checkout -b feat/us-only-sendwyre-1568 origin/feat/us-only-sendwyre-1568

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 feat/us-only-sendwyre-1568

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 feat/us-only-sendwyre-1568 into master
The source branch is 18 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #72713954 passed for 11a2aeb7 on feat/us-only-sendwyre-1568
          Merge request approved. Approved by
          Mark Harding
          Mark Harding
          Emiliano Balbuena
          Emiliano Balbuena
          Martin Santangelo
          Martin Santangelo
          Marcelo Rivera
          Marcelo Rivera
          Brian Hatchet
          Brian Hatchet
          Ready to be merged automatically. Ask someone with write access to this repository to merge this request

          Deletes source branch

          • Discussion 2
          • Commits 1
          • Pipelines 1
          • Changes 1
          0/1 thread resolved
          • Loading...
          • Mark Harding @markeharding approved this merge request 1 day ago

            approved this merge request

          • Ben Hayward @benhayward.ben added MR::Awaiting Review Squad::Green scoped labels 21 hours ago

            added MR::Awaiting Review Squad::Green scoped labels

          • Brian Hatchet
            Brian Hatchet :speech_balloon: @brianhatchet started a thread on the diff 2 hours ago
            Last updated by Brian Hatchet 2 hours ago
            src/app/modules/blockchain/marketing/eth-modal.component.html
            5 5
            6 6 <div class="m-blockchain--marketing--modal m-blockchain__ethModal">
            7 7
            8 <h2>Buy ETH</h2>
            8 <h2>Buy ETH (US Only)</h2>
            • Brian Hatchet
              Brian Hatchet :speech_balloon: @brianhatchet · 2 hours ago
              Maintainer

              I don't see how this breaking the formatting, but the modal has some layout issues now.

              https://www.evernote.com/l/AGvJRz_9ahVFjIGoUIOQPteXqRyHaggX6IAB/image.png

            • Brian Hatchet
              Brian Hatchet :speech_balloon: @brianhatchet · 2 hours ago
              Maintainer

              It's a responsive issue unrelated to this change, but we should probably fix it while we are in here. If you resize the window you can get the USD = to overlap

            • Please register or sign in to reply
          • 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
          None
          Milestone
          None
          Assign milestone
          None
          Time tracking
          No estimate or time spent
          2
          Labels
          MR::Awaiting Review Squad::Green
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          6
          6 participants
          user avatar
          Emiliano Balbuena
          user avatar
          Martin Santangelo
          user avatar
          Marcelo Rivera
          user avatar
          Brian Hatchet
          user avatar
          Mark Harding
          user avatar
          Ben Hayward
          Reference: minds/front!461