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 882
    • Issues 882
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 51
    • Merge Requests 51
  • 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
  • !508

Open
Opened 6 days ago by Mark Harding@markeharding
  • Report abuse
Report abuse

Epic/37 wire

Depends on engine!254

Edited 3 hours ago by Mark Harding

Check out, review, and merge locally

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

git fetch origin
git checkout -b epic/37-wire origin/epic/37-wire

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 epic/37-wire

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 epic/37-wire into master
The source branch is 1 commit behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #78668194 passed with warnings for dbe41ee5 on epic/37-wire
              Requires 2 more approvals from Devs and Deployers.
              Brian Hatchet
              Brian Hatchet
              Marcelo Rivera
              Marcelo Rivera
              Juan Manuel Solaro
              Juan Manuel Solaro
              Olivia Madrid
              Olivia Madrid
              Emiliano Balbuena
              Emiliano Balbuena
              Ready to be merged automatically. Ask someone with write access to this repository to merge this request

              Deletes source branch

              • Discussion 3
              • Commits 12
              • Pipelines 8
              • Changes 51
              0/3 threads resolved
              • Loading...
              • Mark Harding @markeharding changed the description 6 days ago

                changed the description

              • Mark Harding @markeharding mentioned in merge request engine!254 6 days ago

                mentioned in merge request engine!254

              • Mark Harding @markeharding marked as a Work In Progress 6 days ago

                marked as a Work In Progress

              • Mark Harding @markeharding added 121 commits 4 days ago

                added 121 commits

                • 06d5f495...6a48c5b1 - 119 commits from branch master
                • 0fa095f2 - Merge branch 'master' of gitlab.com:minds/front into epic/37-wire
                • 153f98d7 - (feat): put everything behind a feature flag

                Compare with previous version

              • Mark Harding @markeharding added 1 commit 4 days ago

                added 1 commit

                • 7feb3e46 - (chore): bump package lock

                Compare with previous version

              • Mark Harding @markeharding added 20 commits 4 hours ago

                added 20 commits

                • 7feb3e46...5ed6e576 - 18 commits from branch master
                • c822fc52 - (fix): move usd into canary flag
                • dbe41ee5 - Merge branch 'master' of gitlab.com:minds/front into epic/37-wire

                Compare with previous version

              • Mark Harding @markeharding unmarked as a Work In Progress 3 hours ago

                unmarked as a Work In Progress

              • Brian Hatchet
                Brian Hatchet :speech_balloon: @brianhatchet started a thread on the diff 2 hours ago
                src/app/modules/wallet/usd/onboarding/onboarding.component.html
                102 <input
                103 formControlName="city"
                104 type="text"
                105 placeholder="eg. New York City"
                106 i18n-placeholder="@@MONETIZATION__ONBOARDING__CITY_PLACEHOLDER"
                107 class="m-input"
                108 >
                109 </div>
                110
                111 <div class="mdl-cell mdl-cell--6-col" *ngIf="isCountry(['US'])">
                112 <label i18n="State as a country entity@@M__COMMON__COUNTRY_STATE">State</label>
                113 <minds-state-input [state]="form.controls.state.value" (stateChange)="form.controls.state.setValue($event)" [disabled]="restrictAsVerified"></minds-state-input>
                114 </div>
                115
                116 <div class="mdl-cell mdl-cell--6-col" *ngIf="isCountry(['AU', 'CA', 'IE'])">
                117 <label i18n="@@MONETIZATION__ONBOARDING__STATE_PROVINCE_LABEL">State / Province</label>
                • Brian Hatchet
                  Brian Hatchet :speech_balloon: @brianhatchet · 2 hours ago
                  Developer

                  These variable country codes feel like they should be in their own component

                • Please register or sign in to reply
              • Brian Hatchet
                Brian Hatchet :speech_balloon: @brianhatchet started a thread on the diff 2 hours ago
                src/app/modules/wallet/usd/onboarding/onboarding.component.ts
                109 this.minds.user.programs.push('affiliate');
                110
                111 this.minds.user.merchant = {
                112 'id': response.account.id,
                113 'service': 'stripe',
                114 };
                115
                116 this.router.navigate(['/wallet/usd/']);
                117 } catch(e) {
                118 this.inProgress = false;
                119 this.error = e.message;
                120 this.detectChanges();
                121 }
                122 }
                123
                124 update() {
                • Brian Hatchet
                  Brian Hatchet :speech_balloon: @brianhatchet · 2 hours ago
                  Developer

                  Does this need to be async?

                • Please register or sign in to reply
              • Brian Hatchet
                Brian Hatchet :speech_balloon: @brianhatchet started a thread on the diff 2 hours ago
                src/app/modules/wire/wire.service.spec.ts
                62 71 tick();
                • Brian Hatchet
                  Brian Hatchet :speech_balloon: @brianhatchet · 2 hours ago
                  Developer

                  Nothing wrong with the unit tests, but we either need e2e testing or a card to e2e test the wire service

                • 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
              Assignee
              Mark Harding's avatar Mark Harding @markeharding
              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
              9
              9 participants
              user avatar
              Brian Hatchet
              user avatar
              Marcelo Rivera
              user avatar
              Juan Manuel Solaro
              user avatar
              Olivia Madrid
              user avatar
              Emiliano Balbuena
              user avatar
              Martin Santangelo
              user avatar
              Ben Hayward
              Reference: minds/front!508