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 890
    • Issues 890
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 48
    • Merge Requests 48
  • 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
  • !464

Open
Opened 1 month ago by Guy Thouret@gthouret
  • Report abuse
Report abuse

Rewards Notifications

Related to #1582

Edited 4 weeks ago by Guy Thouret

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/588-state-on-user origin/feat/588-state-on-user

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/588-state-on-user

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/588-state-on-user into master
The source branch is 13 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #79234865 passed with warnings for 8f28c461 on feat/588-state-on-user
              Merge request approved. Approved by
              Mark Harding
              Mark Harding
              Emiliano Balbuena
              Emiliano Balbuena
              Brian Hatchet
              Brian Hatchet
              Martin Santangelo
              Martin Santangelo
              Marcelo Rivera
              Marcelo Rivera
              Ben Hayward
              Ben Hayward
              Ready to be merged automatically. Ask someone with write access to this repository to merge this request

              Mentions #1582

              • Discussion 2
              • Commits 10
              • Pipelines 7
              • Changes 12
              • Loading...
              • Guy Thouret @gthouret changed milestone to %sprint: Jolly Jellyfish 1 month ago

                changed milestone to %sprint: Jolly Jellyfish

              • Guy Thouret @gthouret added MR::Awaiting Review Priority::2 - Normal Product::Wallet Squad::Blue Type::Feature scoped labels 1 month ago

                added MR::Awaiting Review Priority::2 - Normal Product::Wallet Squad::Blue Type::Feature scoped labels

              • Guy Thouret
                Guy Thouret @gthouret · 1 month ago
                Developer

                Could do with a second opinion on wording of the notifications.

              • Guy Thouret @gthouret added 1 commit 4 weeks ago

                added 1 commit

                • ab0ae00b - (feat) Display token multiplier on contributions page and apply to the...

                Compare with previous version

              • Guy Thouret @gthouret added 2 commits 4 weeks ago

                added 2 commits

                • 7ea80d90 - (feat) Rewording of daily reward notification to indicate tokens were earned...
                • 378e5453 - (fix) Regression in chart component test due to requiring input values - #1488

                Compare with previous version

              • Guy Thouret @gthouret unmarked as a Work In Progress 4 weeks ago

                unmarked as a Work In Progress

              • Guy Thouret @gthouret added 1 commit 4 weeks ago

                added 1 commit

                • 48257d97 - (fix) Test regression from daily reward notification rewording - #1582

                Compare with previous version

              • Guy Thouret @gthouret mentioned in merge request engine!293 (merged) 2 weeks ago

                mentioned in merge request engine!293 (merged)

              • Guy Thouret @gthouret added 89 commits 1 week ago

                added 89 commits

                • 48257d97...37ac7b64 - 87 commits from branch master
                • ab2cd643 - Merge branch 'master' into feat/588-state-on-user
                • c90ffa6f - (feat) Explanation of user states and multiplier values in wallet 101 - #1758

                Compare with previous version

              • Guy Thouret @gthouret added 33 commits 5 days ago

                added 33 commits

                • c90ffa6f...d69d2bd0 - 31 commits from branch master
                • 3ae9aa12 - Merge branch 'master' into feat/588-state-on-user
                • 8f28c461 - (chore) Linting recent changes

                Compare with previous version

              • Mark Harding @markeharding approved this merge request 1 day ago

                approved this merge request

              • Jack Ottman
                Jack Ottman @jotto141 · 4 minutes ago
                Owner

                Some feedback for you @gthouret

                1. i would add the state they are currently in next to reward multiplier (contributions tab) with a tool tip explaining what the state means and maybe link to the explanation page on token 101

                2. we may even want to display the user state on their channel publicly @markeharding @ottman

                3. notifications is the main thing I would like to test somehow assuming the multipliers are working properly. ideally we can start to send notifications right BEFORE the user drops a user state, encouraging them to log in to avoid that happening. is there a way to read the notifications, or test this?

                will keep thinking of other feedback.

              • 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
              sprint: Jolly Jellyfish
              Milestone
              sprint: Jolly Jellyfish
              Assign milestone
              None
              Time tracking
              No estimate or time spent
              5
              Labels
              MR::Awaiting Review Priority::2 - Normal Product::Wallet Squad::Blue Type::Feature
              Assign labels
              • View project labels
              Lock merge request
              Unlocked
              9
              9 participants
              user avatar
              Emiliano Balbuena
              user avatar
              Brian Hatchet
              user avatar
              Martin Santangelo
              user avatar
              Marcelo Rivera
              user avatar
              Ben Hayward
              user avatar
              Jack Ottman
              user avatar
              Mark Harding
              Reference: minds/front!464