Skip to content

Minds Frontend
Minds Frontend
Commit e5e50c2b authored by Mark Harding's avatar Mark Harding
Browse files
Options
  • Download

(fix): further fixes for prettier upgrade

parent d05f20d6
master
No related merge requests found
Pipeline #95099716 running with stages
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 30 deletions
src/app/common/components/badges/badges.component.ts
View file @ e5e50c2b
......@@ -44,7 +44,7 @@ export class ChannelBadgesComponent {
} else if (
!this.user.is_admin &&
this.session.isAdmin() &&
this.user.guid !== this.session.getLoggedInUser().guid
this.user.guid !== this.session.getLoggedInUser().guid
) {
return true;
}
......
src/app/mocks/common/api/minds-http-client.service.mock.ts
View file @ e5e50c2b
......@@ -14,7 +14,8 @@ export let mindsHttpClientMock = new (function() {
}
if (
!res ||
(res.status && res.status === 'error') || res.status === 'failed'
(res.status && res.status === 'error') ||
res.status === 'failed'
)
observer.error(res);
......
src/app/modules/groups/profile/filter-selector/filter-selector.component.html
View file @ e5e50c2b
......@@ -5,7 +5,7 @@
[class.m-groups--filter-selector-active]="filter == 'activity'"
[routerLink]="['/groups/profile', group.guid, 'feed']"
i18n="
group activities
group activities
selector|@@GROUPS__PROFILE__FILTER_SELECTOR__FEED_OPTION
"
>Feed</a
......@@ -15,7 +15,7 @@
[class.m-groups--filter-selector-active]="filter == 'image'"
[routerLink]="['/groups/profile', group.guid, 'feed', 'image']"
i18n="
group activities
group activities
selector|@@GROUPS__PROFILE__FILTER_SELECTOR__FEED_OPTION
"
>Images</a
......
src/app/modules/modals/confirm-password/modal.component.html
View file @ e5e50c2b
......@@ -18,7 +18,7 @@
<ng-container
*ngIf="error == 'LoginException::Unknown'"
i18n="
@@MINDS__LOGIN__EXCEPTION__THERE_HAS_BEEN_AN_ERROR_PLEASE_TRY_AGAIN
@@MINDS__LOGIN__EXCEPTION__THERE_HAS_BEEN_AN_ERROR_PLEASE_TRY_AGAIN
"
>
There's been an error. Please try again
......
src/app/modules/monetization/ad-sharing/analytics/analytics.component.html
View file @ e5e50c2b
......@@ -43,7 +43,7 @@
>
<ng-container
i18n="
@@MONETIZATION__AD_SHARING__ANALYTICS__PAYOUT_UNDER_REVIEW_LABEL
@@MONETIZATION__AD_SHARING__ANALYTICS__PAYOUT_UNDER_REVIEW_LABEL
"
>Your payment request for
{{ payouts.amount | currency: 'USD':true }} is currently under review
......
src/app/modules/monetization/onboarding/onboarding.component.html
View file @ e5e50c2b
......@@ -172,7 +172,7 @@
type="text"
placeholder="State or province"
i18n-placeholder="
@@MONETIZATION__ONBOARDING__STATE_PROVINCE_PLACEHOLDER
@@MONETIZATION__ONBOARDING__STATE_PROVINCE_PLACEHOLDER
"
/>
</div>
......
src/app/modules/monetization/revenue/options.component.html
View file @ e5e50c2b
......@@ -94,7 +94,7 @@
<ng-template #editingCaption>
<p
i18n="
@@MONETIZATION__REVENUE__OPTIONS__ENTER_BANK_DETAILS_BELOW_LABEL
@@MONETIZATION__REVENUE__OPTIONS__ENTER_BANK_DETAILS_BELOW_LABEL
"
>
Enter your new bank account details below.
......@@ -128,7 +128,9 @@
<div class="mdl-cell mdl-cell--12-col">
<label
i18n="
@@MONETIZATION__REVENUE__OPTIONS__ROUTING_NUMBER_SORT_CODE_LABEL
"
>Routing Number / Sort Code</label
>
......
src/app/modules/newsfeed/dropdown/dropdown.component.html
View file @ e5e50c2b
......@@ -174,7 +174,7 @@
<m-tooltip
icon="help"
i18n="
@@MINDS__NEWSFEED__BOOST_ROTATOR__BOOST_VISIBILITY_UPGRADE_TOOLTIP
@@MINDS__NEWSFEED__BOOST_ROTATOR__BOOST_VISIBILITY_UPGRADE_TOOLTIP
"
>
Upgrade to Plus in order to turn off Boost.
......
src/app/modules/notifications/notification.component.html
View file @ e5e50c2b
......@@ -267,7 +267,7 @@
!notification.entityObj.title
"
i18n="
object belonging to
object belonging to
user@@NOTIFICATIONS__NOTIFICATION__OTHER_OBJECT
"
>{{ notification.entityObj.ownerObj.name }}'s
......@@ -281,7 +281,7 @@
!notification.entityObj.title
"
i18n="
object belonging to current
object belonging to current
user@@NOTIFICATIONS__NOTIFICATION__OWN_OBJECT
"
>your {{ notification.entityObj.subtype }}</span
......@@ -302,7 +302,7 @@
<p>
<ng-container
i18n="
@@NOTIFICATIONS__NOTIFICATION__REPLIED_TO_GROUP_CONVERSATION
@@NOTIFICATIONS__NOTIFICATION__REPLIED_TO_GROUP_CONVERSATION
"
*ngIf="notification.params?.is_reply"
>
......@@ -356,7 +356,7 @@
class="pseudo-link mdl-color-text--blue-grey-400"
*ngIf="!notification.entityObj.title"
i18n="
object belonging to current
object belonging to current
user@@NOTIFICATIONS__NOTIFICATION__OWN_OBJECT
"
>your {{ notification.entityObj.subtype }}</span
......@@ -470,7 +470,7 @@
class="pseudo-link mdl-color-text--blue-grey-400"
*ngIf="!notification.entityObj.title"
i18n="
object belonging to current
object belonging to current
user@@NOTIFICATIONS__NOTIFICATION__OWN_OBJECT
"
>your {{ notification.entityObj.subtype }}</span
......@@ -493,7 +493,7 @@
<p *ngIf="!notification.entityObj.title">
<ng-container
i18n="
@@NOTIFICATIONS__NOTIFICATION__DOWNVOTE__VOTED_DOWN_OWN_ACTIVITY
@@NOTIFICATIONS__NOTIFICATION__DOWNVOTE__VOTED_DOWN_OWN_ACTIVITY
"
>{{ notification.fromObj.name }} down voted
<span class="pseudo-link mdl-color-text--blue-grey-400"
......@@ -539,7 +539,7 @@
>
<p
i18n="
@@NOTIFICATIONS__NOTIFICATION__DOWNVOTE__VOTED_DOWN_CONVERSATION
@@NOTIFICATIONS__NOTIFICATION__DOWNVOTE__VOTED_DOWN_CONVERSATION
"
>
<span class="pseudo-link mdl-color-text--blue-grey-400">{{
......@@ -587,7 +587,7 @@
class="pseudo-link mdl-color-text--blue-grey-400"
*ngIf="!notification.entityObj.title"
i18n="
object belonging to current
object belonging to current
user@@NOTIFICATIONS__NOTIFICATION__OWN_OBJECT
"
>your {{ notification.entityObj.subtype }}</span
......@@ -807,7 +807,9 @@
>
<ng-container
i18n="
boost@@NOTIFICATIONS__NOTIFICATION__BOOST_SUBMITTED__AWAITING_APPROVAL
"
>
is awaiting approval.</ng-container
......@@ -868,7 +870,9 @@
>
<ng-container
i18n="
boost@@NOTIFICATIONS__NOTIFICATION__BOOST_SUBMITTED_P2P__AWAITING_APPROVAL_BY
"
>
is awaiting approval by
......@@ -1305,7 +1309,7 @@
<p>
<ng-container
i18n="
@@NOTIFICATIONS__NOTIFICATION__BOOST_PEER_ACCEPTED__ACCEPTED_BID
@@NOTIFICATIONS__NOTIFICATION__BOOST_PEER_ACCEPTED__ACCEPTED_BID
"
><b>@{{ notification.from.username }}</b> accepted your bid
of</ng-container
......@@ -1366,7 +1370,7 @@
<p>
<ng-container
i18n="
@@NOTIFICATIONS__NOTIFICATION__BOOST_PEER_REJECTED__DECLINED_BID
@@NOTIFICATIONS__NOTIFICATION__BOOST_PEER_REJECTED__DECLINED_BID
"
><b>@{{ notification.from.username }}</b> declined your bid
of</ng-container
......@@ -1705,7 +1709,9 @@
<span
class="pseudo-link mdl-color-text--blue-grey-400"
i18n="
@@NOTIFICATIONS__NOTIFICATION__REPORT_ACTIONED__ACTIVITY_TITLE_BEEN
"
>Your post {{ notification.entityObj.title }}</span
>
......@@ -1754,7 +1760,9 @@
<a target="_blank" routerLink="/wallet/tokens/contributions">
<p
i18n="
@@NOTIFICATIONS__NOTIFICATION__REWARDS__YOU_HAVE_RECEIVED_X_TOKENS_TODAY
"
>
You earned {{ notification.params.amount }} tokens today.
......
src/app/modules/pro/channel/list/list.component.ts
View file @ e5e50c2b
......@@ -61,8 +61,8 @@ export class ProChannelListComponent implements OnInit, OnDestroy {
return (
entity.type === 'group' ||
!!entity.thumbnail_src ||
!!entity.custom_data ||
(entity.thumbnails && entity.thumbnails.length > 0)
!!entity.custom_data ||
(entity.thumbnails && entity.thumbnails.length > 0)
);
});
})
......
src/app/modules/wallet/balances/tokens/balance.component.html
View file @ e5e50c2b
......@@ -54,7 +54,9 @@
icon="help"
*ngIf="address.label == 'OnChain & Receiver'"
i18n="
@@WALLET__BALANCES__TOKENS__ADDRESS_LABEL_TOOLTIP_ONCHAIN_AND_RECEIVER
"
>
This is your currently active Web3/Metamask wallet and is also
......
src/app/modules/wallet/tokens/onboarding/onchain/onchain.component.html
View file @ e5e50c2b
......@@ -182,7 +182,7 @@
<ng-container *ngIf="downloadingMetamask">
<b
i18n="
@@WALLET__TOKENS__ONBOARDING__ONCHAIN__METAMASK_NOTE_RELOAD
@@WALLET__TOKENS__ONBOARDING__ONCHAIN__METAMASK_NOTE_RELOAD
"
>
Note: After installing and setting up MetaMask you might need to
......@@ -199,7 +199,8 @@
class="m-btn m-btn--slim m-btn--action"
(click)="downloadMetamask()"
i18n="
@@WALLET__TOKENS__ONBOARDING__ONCHAIN__DOWNLOAD_METAMASK_ACTION
@@WALLET__TOKENS__ONBOARDING__ONCHAIN__DOWNLOAD_METAMASK_ACTION
"
>
Download MetaMask
......@@ -220,7 +221,8 @@
<ng-template
#noProvidedAddress
i18n="
@@WALLET__TOKENS__ONBOARDING__ONCHAIN__METAMASK_LOCKED_LEGEND
@@WALLET__TOKENS__ONBOARDING__ONCHAIN__METAMASK_LOCKED_LEGEND
"
>
MetaMask is either locked or connected to another network.
......
src/app/modules/wallet/usd/onboarding/onboarding.component.html
View file @ e5e50c2b
......@@ -178,7 +178,7 @@
type="text"
placeholder="State or province"
i18n-placeholder="
@@MONETIZATION__ONBOARDING__STATE_PROVINCE_PLACEHOLDER
@@MONETIZATION__ONBOARDING__STATE_PROVINCE_PLACEHOLDER
"
class="m-input"
/>
......
src/app/modules/wire/channel/channel.component.ts
View file @ e5e50c2b
......@@ -134,9 +134,9 @@ export class WireChannelComponent {
return (
isOwner ||
this.rewards.description ||
(this.rewards.rewards.points && this.rewards.rewards.points.length) ||
(this.rewards.rewards.money && this.rewards.rewards.money.length) ||
(this.rewards.rewards.tokens && this.rewards.rewards.tokens.length)
(this.rewards.rewards.points && this.rewards.rewards.points.length) ||
(this.rewards.rewards.money && this.rewards.rewards.money.length) ||
(this.rewards.rewards.tokens && this.rewards.rewards.tokens.length)
);
}
......
src/tests/client-mock.spec.ts
View file @ e5e50c2b
......@@ -12,7 +12,8 @@ export let clientMock = new (function() {
}
if (
!res ||
(res.status && res.status === 'error') || res.status === 'failed'
(res.status && res.status === 'error') ||
res.status === 'failed'
)
reject(res);
......
src/tests/upload-mock.spec.ts
View file @ e5e50c2b
......@@ -13,7 +13,8 @@ export let uploadMock = new (function() {
}
if (
!res ||
(res.status && res.status === 'error') || res.status === 'failed'
(res.status && res.status === 'error') ||
res.status === 'failed'
)
reject(res);
......
Please register or to comment