Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Frontend
Minds Frontend
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 841
    • Issues 841
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 43
    • Merge Requests 43
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • 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
  • Jobs
  • Commits
  • Issue Boards
  • Minds
  • Minds FrontendMinds Frontend
  • Merge Requests
  • !460

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

WIP: [Sprint/JollyJellyfish](feat) Plus tiers engine#578

Depends on engine#578 (closed) Closes mobile-native#1093 (moved)

Need to add tests before im happy.

Edited 1 month ago by Ben Hayward

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/plus-tiers-578" "origin/feat/plus-tiers-578"

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/plus-tiers-578"

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/plus-tiers-578 into master
The source branch is 194 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #74979859 passed for a7e02de0 on feat/plus-tiers-578
          Requires 2 more approvals from Devs and Deployers.
          Martin Santangelo
          Martin Santangelo
          Brian Hatchet
          Brian Hatchet
          Emiliano Balbuena
          Emiliano Balbuena
          Marcelo Rivera
          Marcelo Rivera
          Mark Harding
          Mark Harding
          There are merge conflicts. Resolve these conflicts or ask someone with write access to this repository to merge it locally

          Closes mobile-native#1093 (moved)

          Mentions engine#578 (closed)

          Deletes source branch

          You can merge this merge request manually using the
          • Discussion 12
          • Commits 20
          • Pipelines 17
          • Changes 10
          2/2 threads resolved
          • Loading...
          • Ben Hayward @benhayward.ben mentioned in merge request engine!279 1 month ago

            mentioned in merge request engine!279

          • Ben Hayward @benhayward.ben added 1 commit 1 month ago

            added 1 commit

            • 9ddbd7fe - fixed tests

            Compare with previous version

          • Ben Hayward @benhayward.ben changed the description 1 month ago

            changed the description

          • Ben Hayward @benhayward.ben changed the description 1 month ago

            changed the description

          • Ben Hayward @benhayward.ben added 1 commit 1 month ago

            added 1 commit

            • a4717b76 - added tests for new component

            Compare with previous version

          • Ben Hayward @benhayward.ben added 1 commit 1 month ago

            added 1 commit

            • 149294c3 - added test

            Compare with previous version

          • Ben Hayward @benhayward.ben added 1 commit 1 month ago

            added 1 commit

            • 32bff9c5 - theming

            Compare with previous version

          • Mark Harding
            Mark Harding @markeharding started a thread on an old version of the diff 1 month ago
            Resolved by Ben Hayward 1 month ago
          • Mark Harding
            Mark Harding @markeharding started a thread on an old version of the diff 1 month ago
            Resolved by Ben Hayward 1 month ago
          • Mark Harding
            Mark Harding @markeharding · 1 month ago
            Owner

            Looking good. Beware of modal -> modal flow though, I think it will replace it and close the previous one down (so not going back).

            Also, please don't push up fit.. we should open a ticket to put something in the CI to warn us.

          • Ben Hayward @benhayward.ben added MR::Requires Changes Squad::Green scoped labels 1 month ago

            added MR::Requires Changes Squad::Green scoped labels

          • Ben Hayward
            Ben Hayward @benhayward.ben · 1 month ago
            Developer

            Crap! Sorry about that. Made a ticket for it here minds#694 (closed)

            I'll have a think about it. I had a google and found a few hooks we could maybe use / adapt

            • http://niffic.se/2019/05/git-hook-to-stop-committing-focused-tests/
            • https://gist.github.com/DerLobi/d938ac7dc422145f85e6
          • Ben Hayward @benhayward.ben added 1 commit 1 month ago

            added 1 commit

            • 56321036 - Updated to meet feedback (please squash)

            Compare with previous version

          • Ben Hayward @benhayward.ben resolved all threads 1 month ago

            resolved all threads

          • Ben Hayward @benhayward.ben added 1 commit 1 month ago

            added 1 commit

            • bc487db6 - Grabbed plus user from config

            Compare with previous version

          • Ben Hayward @benhayward.ben added MR::Awaiting Review scoped label and automatically removed MR::Requires Changes label 1 month ago

            added MR::Awaiting Review scoped label and automatically removed MR::Requires Changes label

          • Ben Hayward
            Ben Hayward @benhayward.ben · 1 month ago
            Developer

            Awaiting feedback to continue and make responsive.

          • Ben Hayward
            Ben Hayward @benhayward.ben · 1 month ago
            Developer

            Somewhat of a discrepancy from my local and this here pipeline. The engine seems to be functioning correctly, because the new config endpoint served value for plus_guid is available on the site at Minds.blockchain.plus_guid. (can the sandbox using web dev tools).

            The front-end here, in contrast to my local does not working at all, as the modal doesn't pop-up.

            minds-plus-tiers

          • Ben Hayward @benhayward.ben unmarked as a Work In Progress 1 month ago

            unmarked as a Work In Progress

          • Ben Hayward @benhayward.ben marked as a Work In Progress 1 month ago

            marked as a Work In Progress

          • Ben Hayward @benhayward.ben added 1 commit 1 month ago

            added 1 commit

            • 4f5ce1d6 - minor

            Compare with previous version

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

            added 1 commit

            • f611744c - test console

            Compare with previous version

          • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 1 month ago

            approved this merge request

          • Brian Hatchet
            Brian Hatchet :speech_balloon: @brianhatchet · 1 month ago
            Developer

            Tested and works great.

            @ottman found an issue with responsiveness and the button plus-button-responsive-issue

            Just need to make it not WIP. I will create a card for setting up a pre-git check for removing fits and fdescribes

            Edited by Brian Hatchet 1 month ago
          • Brian Hatchet :speech_balloon: @brianhatchet unapproved this merge request 1 month ago

            unapproved this merge request

          • Ben Hayward
            Ben Hayward @benhayward.ben · 1 month ago
            Developer

            Yep, don't worry, was not going to add that in following feedback, as the whole design could have changed.

          • Ben Hayward @benhayward.ben added 2 commits 1 month ago

            added 2 commits

            • eb8c3456 - update to meet feedback
            • ed814110 - Merge branch 'feat/plus-tiers-578' of gitlab.com:minds/front into feat/plus-tiers-578

            Compare with previous version

          • Ben Hayward @benhayward.ben added 2 commits 1 month ago

            added 2 commits

            • 15472022 - fixed up metamask
            • 727ebfcc - more updates

            Compare with previous version

          • Ben Hayward @benhayward.ben added 1 commit 1 month ago

            added 1 commit

            • ab6a5129 - adding tests

            Compare with previous version

          • Ben Hayward @benhayward.ben added 1 commit 1 month ago

            added 1 commit

            • cde37326 - formatting

            Compare with previous version

          • Ben Hayward @benhayward.ben added 1 commit 1 month ago

            added 1 commit

            • 8e10a733 - removing unneeded change to file

            Compare with previous version

          • Ben Hayward @benhayward.ben added 1 commit 1 month ago

            added 1 commit

            • 20cd27a7 - Randomly failing test.

            Compare with previous version

          • Ben Hayward @benhayward.ben added 1 commit 1 month ago

            added 1 commit

            • af03f3b3 - failed build

            Compare with previous version

          • Brian Hatchet
            Brian Hatchet :speech_balloon: @brianhatchet · 1 month ago
            Developer

            More feedback from @jotto141

            Jack doesnt really seem different than the last one still says "Upgrade - 20 tokens / month" on the plus page. Should just say "Purchase" or "Upgrade" Jack and I still see all of the USD options, need to hide those til we have Stripe working with it and not sure if purchasing should be working yet or not, just getting errors when i try

          • Ben Hayward
            Ben Hayward @benhayward.ben · 1 month ago
            Developer

            Just a reminder, we still need an answer to what we do about the token limit. Do we make an exception for plus, or raise it?

          • Ben Hayward @benhayward.ben added 1 commit 1 month ago

            added 1 commit

            • a7e02de0 - aethetic changes

            Compare with previous version

          • Ben Hayward @benhayward.ben added MR::Requires Changes scoped label and automatically removed MR::Awaiting Review label 1 month ago

            added MR::Requires Changes scoped label and automatically removed MR::Awaiting Review label

          • Ben Hayward
            Ben Hayward @benhayward.ben · 1 month ago
            Developer

            Updated anyway to meet that feedback - not going to put the values in helm yet as we still need to work out how to handle lifetime without going over the max daily token limit.

          • Ben Hayward
            Ben Hayward @benhayward.ben · 2 hours ago
            Developer

            @jotto141 @markeharding @ottman this one still stuck in limbo until I hear back re: the pricing.

          • 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::Requires Changes Squad::Green
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          8
          8 participants
          user avatar
          Martin Santangelo
          user avatar
          Brian Hatchet
          user avatar
          Emiliano Balbuena
          user avatar
          Marcelo Rivera
          user avatar
          Mark Harding
          user avatar
          Ben Hayward
          user avatar
          Jack Ottman
          Reference: minds/front!460