From 4a457d3d10dca54759cf14613884907668fb691b Mon Sep 17 00:00:00 2001 From: MTG2000 Date: Wed, 31 Aug 2022 16:12:15 +0300 Subject: [PATCH] feat: change current text & add tooltip --- package.json | 2 +- .../LinkedAccountsCard/LinkedAccountsCard.tsx | 2 ++ .../LinkedAccountsCard/WalletKey.tsx | 17 ++++++++++------- src/styles/vendors.scss | 4 ++++ 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 6c46e49..e1211c7 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,7 @@ "server:preview": "env-cmd -f ./envs/server/preview.env serverless offline", "client:prod-server": "env-cmd -f ./envs/client/prod-server.env react-scripts start", "server:prod": "env-cmd -f ./envs/server/prod.env serverless offline", - "client:mocks": "env-cmd -f ./envs/client/.mock-server.env react-scripts start", + "client:mocks": "env-cmd -f ./envs/client/mock-server.env react-scripts start", "generate-graphql": "graphql-codegen", "storybook": "env-cmd -f ./envs/client/.dev.preview-server.env start-storybook -p 6006 -s public", "storybook:mocks": "env-cmd -f ./envs/client/.dev.mock-server.env start-storybook -p 6006 -s public", diff --git a/src/features/Profiles/pages/EditProfilePage/PreferencesTab/LinkedAccountsCard/LinkedAccountsCard.tsx b/src/features/Profiles/pages/EditProfilePage/PreferencesTab/LinkedAccountsCard/LinkedAccountsCard.tsx index 2a0ed50..8303d6f 100644 --- a/src/features/Profiles/pages/EditProfilePage/PreferencesTab/LinkedAccountsCard/LinkedAccountsCard.tsx +++ b/src/features/Profiles/pages/EditProfilePage/PreferencesTab/LinkedAccountsCard/LinkedAccountsCard.tsx @@ -38,6 +38,7 @@ export default function LinkedAccountsCard({ value, onChange }: Props) { onChange([...value.slice(0, idx), ...value.slice(idx + 1)]) } + const hasMultiWallets = value.length > 1; return ( @@ -50,6 +51,7 @@ export default function LinkedAccountsCard({ value, onChange }: Props) { {value.map((item, idx) => updateKeyName(idx, v)} onDelete={() => deleteKey(idx)} diff --git a/src/features/Profiles/pages/EditProfilePage/PreferencesTab/LinkedAccountsCard/WalletKey.tsx b/src/features/Profiles/pages/EditProfilePage/PreferencesTab/LinkedAccountsCard/WalletKey.tsx index 180a85f..e7fe210 100644 --- a/src/features/Profiles/pages/EditProfilePage/PreferencesTab/LinkedAccountsCard/WalletKey.tsx +++ b/src/features/Profiles/pages/EditProfilePage/PreferencesTab/LinkedAccountsCard/WalletKey.tsx @@ -1,7 +1,7 @@ import { useToggle } from '@react-hookz/web'; import { createAction } from '@reduxjs/toolkit'; import { useCallback, useEffect, useMemo, useRef, useState } from 'react' -import { FiTrash2 } from 'react-icons/fi'; +import { FiTrash2, FiLock } from 'react-icons/fi'; import Button from 'src/Components/Button/Button'; import IconButton from 'src/Components/IconButton/IconButton'; import { useReduxEffect } from 'src/utils/hooks/useReduxEffect'; @@ -13,13 +13,14 @@ import { usePopperTooltip } from 'react-popper-tooltip'; interface Props { walletKey: WalletKeyType, + hasMultiWallets?: boolean; onRename: (newName: string) => void onDelete: () => void } -export default function WalletKey({ walletKey, onRename, onDelete }: Props) { +export default function WalletKey({ walletKey, hasMultiWallets, onRename, onDelete }: Props) { const ref = useRef(null!); const [name, setName] = useState(walletKey.name); @@ -90,7 +91,7 @@ export default function WalletKey({ walletKey, onRename, onDelete }: Props) { onClick={saveNameChanges} >Save} -
+ {hasMultiWallets &&
{!walletKey.is_current ? handleDelete()} > : <> - (Current) + + + {visible && (
- Tooltip + You're now logged-in with this wallet.
To remove it, login to your account with a different wallet.
)} } -
+
} ) } diff --git a/src/styles/vendors.scss b/src/styles/vendors.scss index b969d29..08e54e1 100644 --- a/src/styles/vendors.scss +++ b/src/styles/vendors.scss @@ -39,3 +39,7 @@ transition-timing-function: ease-in; transition-duration: 400ms; } + +.tooltip-arrow::after { + border-color: var(--arrowColor, #101828) transparent !important; +}