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 821
    • Issues 821
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 47
    • Merge Requests 47
  • 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
  • !460

Open
Opened 20 hours ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

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

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

Need to add tests before im happy.

Edited 5 hours 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 6 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #72539901 passed for 32bff9c5 on feat/plus-tiers-578
          Requires 2 more approvals from Devs and Deployers.
          Martin Santangelo
          Martin Santangelo
          Mark Harding
          Mark Harding
          Brian Hatchet
          Brian Hatchet
          Marcelo Rivera
          Marcelo Rivera
          Emiliano Balbuena
          Emiliano Balbuena
          This is a Work in Progress

          Closes mobile-native#1093 (closed)

          Mentions engine#578

          Deletes source branch

          You can merge this merge request manually using the
          • Discussion 3
          • Commits 6
          • Pipelines 5
          • Changes 10
          0/2 threads resolved
          • Loading...
          • Ben Hayward @benhayward.ben mentioned in merge request engine!279 20 hours ago

            mentioned in merge request engine!279

          • Ben Hayward @benhayward.ben added 1 commit 20 hours ago

            added 1 commit

            • 9ddbd7fe - fixed tests

            Compare with previous version

          • Ben Hayward @benhayward.ben changed the description 20 hours ago

            changed the description

          • Ben Hayward @benhayward.ben changed the description 5 hours ago

            changed the description

          • Ben Hayward @benhayward.ben added 1 commit 3 hours ago

            added 1 commit

            • a4717b76 - added tests for new component

            Compare with previous version

          • Ben Hayward @benhayward.ben added 1 commit 3 hours ago

            added 1 commit

            • 149294c3 - added test

            Compare with previous version

          • Ben Hayward @benhayward.ben added 1 commit 2 hours ago

            added 1 commit

            • 32bff9c5 - theming

            Compare with previous version

          • Mark Harding
            Mark Harding @markeharding started a thread on the diff 50 minutes ago
            src/app/modules/plus/plan/payment-plan.component.ts
            1 import { Component, ChangeDetectorRef } from '@angular/core';
            2 import { CurrencyPipe } from '@angular/common';
            3 import { OverlayModalService } from '../../../services/ux/overlay-modal';
            4 import { Client } from '../../../services/api';
            5 import { Session } from '../../../services/session';
            6 import { Router } from '@angular/router';
            7 import { WirePaymentsCreatorComponent } from '../../wire/payments-creator/creator.component';
            8 export type PayloadType = 'onchain' | 'offchain';
            9
            10 @Component({
            11 providers: [CurrencyPipe],
            12 selector: 'm-wire-payments--payment-plan',
            • Mark Harding
              Mark Harding @markeharding · 50 minutes ago
              Owner

              double check the selector here, looks out of context

            • Please register or sign in to reply
          • Mark Harding
            Mark Harding @markeharding started a thread on the diff 48 minutes ago
            src/app/modules/wire/wire.service.spec.ts
            88 90 amount: 10,
            89 91 payload: { address: 'offchain', token: 'tok_KPte7942xySKBKyrBu11yEpf', method: 'creditcard' },
            90 92 method: 'tokens',
            93 recurring: false,
            94 tier: ''
            95 });
            96 }));
            97
            98 fit('should post the plus tier if one is selected', fakeAsync(() => {
            • Mark Harding
              Mark Harding @markeharding · 48 minutes ago
              Owner

              arghhhh!

            • Please register or sign in to reply
          • Mark Harding
            Mark Harding @markeharding · 46 minutes 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.

          • 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
          0
          Labels
          None
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          6
          6 participants
          user avatar
          Martin Santangelo
          user avatar
          Mark Harding
          user avatar
          Brian Hatchet
          user avatar
          Marcelo Rivera
          user avatar
          Emiliano Balbuena
          user avatar
          Ben Hayward
          Reference: minds/front!460