Skip to content

Commit

Permalink
Merge branch 'binary-com:master' into rostislav/wall-3456/wallet-migr…
Browse files Browse the repository at this point in the history
…ation-banners
  • Loading branch information
rostislav-deriv authored Apr 4, 2024
2 parents bd8d793 + 39818fb commit cd64daf
Show file tree
Hide file tree
Showing 222 changed files with 2,459 additions and 1,989 deletions.
40 changes: 36 additions & 4 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion packages/account-v2/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@deriv-com/utils": "^0.0.11",
"@deriv/api-types": "^1.0.172",
"@deriv/api-v2": "^1.0.0",
"@deriv/quill-icons": "^1.19.5",
"@deriv/quill-icons": "^1.21.0",
"class-variance-authority": "^0.7.0",
"dayjs": "^1.11.10",
"formik": "^2.1.4",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
}

&__popover {
margin-left: 0.8rem;
margin-inline-start: 0.8rem;
}

&--app-settings {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@
justify-content: flex-start;
user-select: none;

@include rtl {
svg:not(:first-child) {
transform: rotate(180deg);
}
}
.dc-icon {
flex: none;
}
Expand Down
28 changes: 17 additions & 11 deletions packages/account/src/Styles/account.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ $MIN_HEIGHT_FLOATING: calc(
}

&__header--active {
border-left: 4px solid var(--brand-red-coral);
padding-left: 4.4rem;
border-inline-start: 4px solid var(--brand-red-coral);
padding-inline-start: 4.4rem;
background-color: var(--general-main-1);
}

Expand All @@ -37,7 +37,7 @@ $MIN_HEIGHT_FLOATING: calc(
cursor: pointer;

&--icon {
margin-right: 0.8rem;
margin-inline-end: 0.8rem;
}
}
}
Expand All @@ -48,14 +48,14 @@ $MIN_HEIGHT_FLOATING: calc(

.dc-vertical-tab__header {
font-size: 1.2rem;
padding-left: 3.9rem;
padding-inline-start: 3.9rem;

&__link {
margin-left: unset;
margin-inline-start: unset;
}

&--highlight {
border-left: unset;
border-inline-start: unset;
}

&-group__icon {
Expand All @@ -69,14 +69,14 @@ $MIN_HEIGHT_FLOATING: calc(
&__financial-assessment {
.account__scrollbars_container {
width: 68.5rem;
margin-left: 6rem;
margin-inline-start: 6rem;
padding-top: 0;
}
}

&__password-wrapper {
width: 68.5rem;
margin-left: 6rem;
margin-inline-start: 6rem;
}
}

Expand All @@ -100,7 +100,7 @@ $MIN_HEIGHT_FLOATING: calc(
line-height: 1.5;
width: calc(100% - 2rem);
float: left;
padding-left: 2rem;
padding-inline-start: 2rem;
}

&-close {
Expand Down Expand Up @@ -1582,6 +1582,12 @@ $MIN_HEIGHT_FLOATING: calc(
@include mobile {
padding-left: 5%;
}

@include rtl {
& > li {
width: fit-content;
}
}
}
}

Expand Down Expand Up @@ -1610,12 +1616,12 @@ $MIN_HEIGHT_FLOATING: calc(
&__button {
&--cancel {
margin-top: 2.4rem;
margin-right: 10px;
margin-inline-end: 10px;
float: right;

@include mobile {
margin-top: -8px;
margin-right: 10px;
margin-inline-end: 10px;
float: right;
}
}
Expand Down
1 change: 0 additions & 1 deletion packages/api/src/hooks/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ export { default as useInfiniteTransactions } from './useInfiniteTransactions';
export { default as useTransferBetweenAccounts } from './useTransferBetweenAccounts';
export { default as useVerifyEmail } from './useVerifyEmail';
export { default as useWalletAccountsList } from './useWalletAccountsList';
export { default as useWalletMigration } from './useWalletMigration';
export { default as useTradingPlatformPasswordReset } from './useTradingPlatformPasswordReset';
export { default as useResetVirtualBalance } from './useResetVirtualBalance';
export { default as useExchangeRates } from './useExchangeRates';
Expand Down
50 changes: 0 additions & 50 deletions packages/api/src/hooks/useWalletMigration.ts

This file was deleted.

1 change: 0 additions & 1 deletion packages/appstore/src/assets/svgs/wallets/how-it-works.svg

This file was deleted.

10 changes: 0 additions & 10 deletions packages/appstore/src/assets/svgs/wallets/image-types.tsx

This file was deleted.

3 changes: 0 additions & 3 deletions packages/appstore/src/assets/svgs/wallets/index.tsx

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

44 changes: 0 additions & 44 deletions packages/appstore/src/assets/svgs/wallets/wallets-image.tsx

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit cd64daf

Please sign in to comment.