Skip to content
Next
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
Minds Frontend
Project
Project
Details
Activity
Releases
Cycle Analytics
Insights
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
829
Issues
829
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
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Minds
Minds Frontend
Compare Revisions
6e4a1554436ae150ff0352d4e7931786e70a7ace...5c4c75d18305f2f7956473b2d1822c2a1d17fff0
Source
5c4c75d18305f2f7956473b2d1822c2a1d17fff0
Select Git revision
...
Target
6e4a1554436ae150ff0352d4e7931786e70a7ace
Select Git revision
Compare
Commits (2)
(chore) Linting user state tooltip and notification changes -
#1859
· 1a9e83e6
Guy Thouret
authored
1 hour ago
1a9e83e6
(chore) Add tooltip component to spec tests -
#1859
· 5c4c75d1
Guy Thouret
authored
1 hour ago
5c4c75d1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
23 deletions
+16
-23
notification.component.html
src/app/modules/notifications/notification.component.html
+8
-5
overview.component.html
...dules/wallet/tokens/contributions/overview.component.html
+4
-1
overview.component.spec.ts
...es/wallet/tokens/contributions/overview.component.spec.ts
+4
-17
No files found.
src/app/modules/notifications/notification.component.html
View file @
5c4c75d1
...
...
@@ -1759,11 +1759,14 @@
<ng-template
ngSwitchCase=
"rewards_state_decrease_today"
>
<a
target=
"_blank"
routerLink=
"/wallet/tokens/contributions"
>
<p
i18n=
"@@NOTIFICATIONS__NOTIFICATION__REWARDS__USER_STATE_DECREASE_TODAY"
>
It's not too late! You will drop down to a {{ notification.params.state }} user
by the end of today and your daily token reward multiplier will reduce to
{{ notification.params.reward_factor }}x. Get liking and commenting to bring
your score back up!
<p
i18n=
"@@NOTIFICATIONS__NOTIFICATION__REWARDS__USER_STATE_DECREASE_TODAY"
>
It's not too late! You will drop down to a
{{ notification.params.state }} user by the end of today and your daily
token reward multiplier will reduce to
{{ notification.params.reward_factor }}x. Get liking and commenting to
bring your score back up!
</p>
</a>
</ng-template>
...
...
This diff is collapsed.
Click to expand it.
src/app/modules/wallet/tokens/contributions/overview.component.html
View file @
5c4c75d1
...
...
@@ -56,7 +56,10 @@
{{ overview.yourRewardFactor | number }}x
</ng-container>
<m-tooltip
icon=
"help"
>
Current User State:
<ng-container
*ngIf=
"user.user_state !== null"
>
{{ user.user_state | titlecase }}
</ng-container>
Current User State:
<ng-container
*ngIf=
"user.user_state !== null"
>
{{
user.user_state | titlecase
}}
</ng-container>
</m-tooltip>
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
src/app/modules/wallet/tokens/contributions/overview.component.spec.ts
View file @
5c4c75d1
...
...
@@ -3,34 +3,20 @@ import {
ComponentFixture
,
TestBed
,
fakeAsync
,
tick
,
}
from
'
@angular/core/testing
'
;
import
{
Component
,
DebugElement
,
ChangeDetectorRef
,
Input
,
Output
,
}
from
'
@angular/core
'
;
import
{
ChangeDetectorRef
}
from
'
@angular/core
'
;
import
{
WalletTokenContributionsOverviewComponent
}
from
'
./overview.component
'
;
import
{
clientMock
}
from
'
../../../../../tests/client-mock.spec
'
;
import
{
Client
}
from
'
../../../../services/api/client
'
;
import
{
Web3WalletService
}
from
'
../../../blockchain/web3-wallet.service
'
;
import
{
TokenPipe
}
from
'
../../../../common/pipes/token.pipe
'
;
import
{
TimediffPipe
}
from
'
../../../../common/pipes/timediff.pipe
'
;
import
{
of
}
from
'
rxjs/internal/observable/of
'
;
import
{
ActivatedRoute
,
Router
}
from
'
@angular/router
'
;
import
{
MockComponent
,
MockDirective
,
MockService
,
}
from
'
../../../../utils/mock
'
;
import
{
Router
}
from
'
@angular/router
'
;
import
{
Session
}
from
'
../../../../services/session
'
;
import
{
RouterTestingModule
}
from
'
@angular/router/testing
'
;
import
{
By
}
from
'
@angular/platform-browser
'
;
import
{
sessionMock
}
from
'
../../../../../tests/session-mock.spec
'
;
import
{
TooltipComponent
}
from
'
../../../../common/components/tooltip/tooltip.component
'
;
describe
(
'
WalletTokenContributionsOverviewComponent
'
,
()
=>
{
let
comp
:
WalletTokenContributionsOverviewComponent
;
let
fixture
:
ComponentFixture
<
WalletTokenContributionsOverviewComponent
>
;
...
...
@@ -41,6 +27,7 @@ describe('WalletTokenContributionsOverviewComponent', () => {
WalletTokenContributionsOverviewComponent
,
TimediffPipe
,
TokenPipe
,
TooltipComponent
,
],
providers
:
[
{
provide
:
Client
,
useValue
:
clientMock
},
...
...
This diff is collapsed.
Click to expand it.