diff --git a/packages/appstore/src/components/account-manager/account-manager.scss b/packages/appstore/src/components/account-manager/account-manager.scss index 7bbed1d21ca7..52c1fd2e8c3e 100644 --- a/packages/appstore/src/components/account-manager/account-manager.scss +++ b/packages/appstore/src/components/account-manager/account-manager.scss @@ -15,6 +15,7 @@ display: flex; flex-direction: column; margin-left: 0.8rem; + margin-right: 1.8rem; &--title { cursor: pointer; } diff --git a/packages/appstore/src/components/add-options/add-options.tsx b/packages/appstore/src/components/add-options/add-options.tsx index 2ed5bcf4459b..f0d15acc8f12 100644 --- a/packages/appstore/src/components/add-options/add-options.tsx +++ b/packages/appstore/src/components/add-options/add-options.tsx @@ -8,9 +8,10 @@ type TAddOptionsProps = { number_of_accounts: number; title: string; description: string; + is_mf: boolean; }; -const AddOptions = ({ number_of_accounts, title, description }: TAddOptionsProps) => { +const AddOptions = ({ number_of_accounts, title, description, is_mf }: TAddOptionsProps) => { const { ui } = useStores(); const getHeightWidthOfIcon = () => { return isMobile() @@ -41,11 +42,13 @@ const AddOptions = ({ number_of_accounts, title, description }: TAddOptionsProps -
- - - -
+ {!is_mf && ( +
+ + + +
+ )} ) : (
diff --git a/packages/appstore/src/components/options/options-accounts.scss b/packages/appstore/src/components/options/options-accounts.scss index ccacac577819..f4b6b7dcdc87 100644 --- a/packages/appstore/src/components/options/options-accounts.scss +++ b/packages/appstore/src/components/options/options-accounts.scss @@ -35,11 +35,13 @@ align-items: center; justify-content: flex-end; height: 7.2rem; - width: 20%; + width: 4%; background: linear-gradient(to right, transparent, var(--general-main-1)); @include mobile { - right: 0; + right: 10%; + top: 15%; height: auto; + width: auto; } } &--add-options { @@ -61,11 +63,11 @@ } } } - &__platformLauncher { + &__platformLauncher, + &__platformLauncher--applauncher { width: 100%; display: flex; flex-direction: row; - background: var(--general-section-5); border-radius: 0rem 0.6rem 0.6rem; padding: 1.6rem 2.4rem; overflow-x: auto; @@ -90,4 +92,14 @@ padding: 1.6rem 0; } } + &__platformLauncher { + background: var(--general-section-5); + } + &__divider { + margin: 1.1rem 0; + height: 0.2rem; + width: 100%; + border: none; + background-color: var(--general-section-1); + } } diff --git a/packages/appstore/src/components/options/options-accounts.tsx b/packages/appstore/src/components/options/options-accounts.tsx index 5682a5f04ae9..9abc216859d1 100644 --- a/packages/appstore/src/components/options/options-accounts.tsx +++ b/packages/appstore/src/components/options/options-accounts.tsx @@ -72,7 +72,7 @@ const OptionsAccounts: React.FunctionComponent
@@ -227,6 +227,7 @@ const OptionsAccounts: React.FunctionComponent
)} @@ -244,9 +245,6 @@ const OptionsAccounts: React.FunctionComponent
)} - {!has_any_real_account && ( - - )} ) : ( -
+ {!has_any_real_account &&
} +
{props.platformlauncherprops.map((item, index) => { return (
diff --git a/packages/appstore/src/components/total-assets/total-assets.tsx b/packages/appstore/src/components/total-assets/total-assets.tsx index be16d551ed0b..1665752e1882 100644 --- a/packages/appstore/src/components/total-assets/total-assets.tsx +++ b/packages/appstore/src/components/total-assets/total-assets.tsx @@ -142,7 +142,7 @@ const TotalAssets = ({ category }: TTotalAssets) => { icon='info' disable_message_icon is_bubble_hover_enabled - message={localize(`Total assets in your Options, DMT5 and Deriv X ${category} accounts`)} + message={localize(`Total assets in your Options, Deriv MT5 and Deriv X ${category} accounts`)} zIndex={9999} />
diff --git a/packages/appstore/src/modules/trading-hub/index.tsx b/packages/appstore/src/modules/trading-hub/index.tsx index c6a20694300e..8829aa4dc036 100644 --- a/packages/appstore/src/modules/trading-hub/index.tsx +++ b/packages/appstore/src/modules/trading-hub/index.tsx @@ -118,8 +118,8 @@ const TradingHub: React.FC = () => { ]; const platform_toggle_options = [ - { text: 'CFD', value: 'cfd' }, - { text: 'Options', value: 'options' }, + { text: 'CFDs', value: 'cfd' }, + { text: 'Options and...', value: 'options' }, ]; tour_step_locale.last = (