Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: error fixes #9

Merged
merged 1 commit into from
Apr 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
33 changes: 31 additions & 2 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,7 +1,37 @@
module.exports = {
extends: ['@deriv-com/eslint-config-deriv'],
plugins: ['simple-import-sort'],
rules: {
'global-require': 'off',
'import/newline-after-import': 'error',
'simple-import-sort/imports': [
'error',
{
groups: [
[
'public-path',
// `react` first, then packages starting with a character
'^react$',
'^[a-z]',
// Packages starting with `@`
'^@',
// Imports starting with `../`
'^\\.\\.(?!/?$)',
'^\\.\\./?$',
// Imports starting with `./`
'^\\./(?=.*/)(?!/?$)',
'^\\.(?!/?$)',
'^\\./?$',
// Style imports
'^.+\\.s?css$',
// Side effect imports
'^\\u0000',
// Delete the empty line copied as the next line of the last import
'\\s*',
],
],
},
],
},
overrides: [
{
Expand Down Expand Up @@ -55,8 +85,7 @@ module.exports = {
},
'import/resolver': {
typescript: {
// use an array
project: 'packages/**/tsconfig.json',

},
node: {
extensions: ['.ts', '.tsx'],
Expand Down
131 changes: 105 additions & 26 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
"fix": "eslint \"./src/**/*.?(js|jsx|ts|tsx)\" --fix",
"preview": "vite preview",
"test:lint": "prettier --log-level silent --write . && eslint \"./src/**/*.?(js|jsx|ts|tsx)\"",
"test": "jest --passWithNoTests",
Expand All @@ -22,8 +23,10 @@
"@sendbird/chat": "^4.11.3",
"@tanstack/react-query": "^5.28.14",
"@tanstack/react-table": "^8.15.0",
"@types/history": "^5.0.0",
"clsx": "^2.1.0",
"downshift": "^9.0.0",
"history": "^5.3.0",
"html2canvas": "^1.4.1",
"lodash": "^4.17.21",
"moment": "^2.30.1",
Expand Down
1 change: 0 additions & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { QueryParamProvider } from 'use-query-params';
import { ReactRouter5Adapter } from 'use-query-params/adapters/react-router-5';

import AppContent from './routes/AppContent';

const App = () => {
Expand Down
2 changes: 1 addition & 1 deletion src/components/AdvertiserName/AdvertiserName.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.p2p-advertiser-name {
.advertiser-name {
display: grid;
grid-gap: 1.6rem;
grid-template-columns: min-content auto max-content;
Expand Down
14 changes: 5 additions & 9 deletions src/components/AdvertiserName/AdvertiserName.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
import { TAdvertiserStats } from 'types';

import { DeepPartial, TAdvertiserStats } from 'types';
import { UserAvatar } from '@/components';
import { getCurrentRoute } from '@/utils';
import { useSettings } from '@deriv/api-v2';
import { LabelPairedEllipsisVerticalLgRegularIcon } from '@deriv/quill-icons';
import { Text, useDevice } from '@deriv-com/ui';

import { UserAvatar } from '@/components';
import { getCurrentRoute } from '@/utils';

import AdvertiserNameBadges from './AdvertiserNameBadges';
import AdvertiserNameStats from './AdvertiserNameStats';
import AdvertiserNameToggle from './AdvertiserNameToggle';

import './AdvertiserName.scss';

const AdvertiserName = ({ advertiserStats }: { advertiserStats: DeepPartial<TAdvertiserStats> }) => {
Expand All @@ -23,9 +19,9 @@ const AdvertiserName = ({ advertiserStats }: { advertiserStats: DeepPartial<TAdv
const name = advertiserStats?.name || email;

return (
<div className='p2p-advertiser-name' data-testid='dt_advertiser_name'>
<div className='advertiser-name' data-testid='dt_advertiser_name'>
<UserAvatar nickname={name!} size={isDesktop ? 64 : 42} textSize='lg' />
<div className='p2p-advertiser-name__details'>
<div className='advertiser-name__details'>
<div className='flex items-center gap-3'>
<Text size='md' weight='bold'>
{name}
Expand Down
2 changes: 1 addition & 1 deletion src/components/AdvertiserName/AdvertiserNameBadges.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.p2p-advertiser-name-badges {
.advertiser-name-badges {
display: flex;
gap: 0.4rem;
padding: 0.4rem 0;
Expand Down
6 changes: 2 additions & 4 deletions src/components/AdvertiserName/AdvertiserNameBadges.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import { TAdvertiserStats } from 'types';

import { DeepPartial, TAdvertiserStats } from 'types';
import { Badge } from '@/components';

import './AdvertiserNameBadges.scss';

/**
Expand All @@ -14,7 +12,7 @@ const AdvertiserNameBadges = ({ advertiserStats }: { advertiserStats: DeepPartia
const { isAddressVerified, isIdentityVerified, totalOrders } = advertiserStats || {};

return (
<div className='p2p-advertiser-name-badges' data-testid='dt_advertiser_name_badges'>
<div className='advertiser-name-badges' data-testid='dt_advertiser_name_badges'>
{(totalOrders || 0) >= 100 && <Badge label='100+' status='trades' variant='warning' />}
<Badge
label='ID'
Expand Down
2 changes: 1 addition & 1 deletion src/components/AdvertiserName/AdvertiserNameStats.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.p2p-advertiser-name-stats {
.advertiser-name-stats {
display: flex;
align-items: center;

Expand Down
12 changes: 4 additions & 8 deletions src/components/AdvertiserName/AdvertiserNameStats.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
import clsx from 'clsx';
import { TAdvertiserStats } from 'types';

import { Text, useDevice } from '@deriv-com/ui';

import { DeepPartial, TAdvertiserStats } from 'types';
import { OnlineStatusIcon, OnlineStatusLabel, StarRating } from '@/components';
import { getCurrentRoute } from '@/utils';

import { Text, useDevice } from '@deriv-com/ui';
import ThumbUpIcon from '../../public/ic-thumb-up.svg';
import BlockedUserOutlineIcon from '../../public/ic-user-blocked-outline.svg';

import './AdvertiserNameStats.scss';

/**
Expand All @@ -34,7 +30,7 @@ const AdvertiserNameStats = ({ advertiserStats }: { advertiserStats: DeepPartial

return (
<div
className={clsx('p2p-advertiser-name-stats', {
className={clsx('advertiser-name-stats', {
'gap-2': !isMyProfile && isMobile,
})}
data-testid='dt_advertiser_name_stats'
Expand Down Expand Up @@ -63,7 +59,7 @@ const AdvertiserNameStats = ({ advertiserStats }: { advertiserStats: DeepPartial
{ratingAverage && (
<>
<div>
<div className='p2p-advertiser-name-stats__rating'>
<div className='advertiser-name-stats__rating'>
{isMobile && (
<Text color='less-prominent' size='sm'>
({ratingAverage})
Expand Down
2 changes: 1 addition & 1 deletion src/components/AdvertiserName/AdvertiserNameToggle.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.p2p-advertiser-name-toggle {
.advertiser-name-toggle {
display: flex;
gap: 0.8rem;

Expand Down
Loading
Loading