diff --git a/packages/extension-base/src/defaults.ts b/packages/extension-base/src/defaults.ts index 7f831a9a8..a02b7bdf7 100644 --- a/packages/extension-base/src/defaults.ts +++ b/packages/extension-base/src/defaults.ts @@ -17,7 +17,8 @@ const START_WITH_PATH = [ '/send/', '/settingsfs/', '/stake/', - '/socialRecovery/' + '/socialRecovery/', + '/notification/' ] as const; const ROOT_PATH = [ diff --git a/packages/extension-polkagate/src/components/ActionButton.tsx b/packages/extension-polkagate/src/components/ActionButton.tsx index ea6037cc6..b5f9f990a 100644 --- a/packages/extension-polkagate/src/components/ActionButton.tsx +++ b/packages/extension-polkagate/src/components/ActionButton.tsx @@ -11,8 +11,43 @@ import { noop } from '@polkadot/util'; import { useIsDark, useIsExtensionPopup, useIsHovered } from '../hooks'; import TwoToneText from './TwoToneText'; +interface IconElementProp { + iconVariant?: 'Bulk' | 'Broken' | 'TwoTone' | 'Outline' | 'Linear' | 'Bold'; + iconVariantOnHover?: 'Bulk' | 'Broken' | 'TwoTone' | 'Outline' | 'Linear' | 'Bold'; + IconName: Icon | undefined; + disabled?: boolean; + isBlueish?: boolean; + iconSize?: number; + iconAlwaysBold?: boolean; + hovered: boolean; +} + +const IconElement = ({ IconName, disabled, hovered, iconAlwaysBold, iconSize, iconVariant, iconVariantOnHover, isBlueish }: IconElementProp) => { + const theme = useTheme(); + + return (IconName + ? ( + ) + : undefined); +}; + export interface ActionButtonProps { StartIcon?: Icon; + EndIcon?: Icon; iconVariant?: 'Bulk' | 'Broken' | 'TwoTone' | 'Outline' | 'Linear' | 'Bold'; iconVariantOnHover?: 'Bulk' | 'Broken' | 'TwoTone' | 'Outline' | 'Linear' | 'Bold'; contentPlacement?: 'start' | 'center' | 'end'; @@ -27,7 +62,7 @@ export interface ActionButtonProps { variant?: 'text' | 'contained' | 'outlined'; } -export default function ActionButton ({ StartIcon, contentPlacement = 'start', disabled, iconAlwaysBold, iconSize = 20, iconVariant, iconVariantOnHover, isBlueish, isBusy, onClick, style, text, variant }: ActionButtonProps): React.ReactElement { +export default function ActionButton ({ EndIcon, StartIcon, contentPlacement = 'start', disabled, iconAlwaysBold, iconSize = 20, iconVariant, iconVariantOnHover, isBlueish, isBusy, onClick, style, text, variant }: ActionButtonProps): React.ReactElement { const theme = useTheme(); const isDark = useIsDark(); const containerRef = useRef(null); @@ -66,6 +101,16 @@ export default function ActionButton ({ StartIcon, contentPlacement = 'start', d } }; + const EndIconStyle = { + '& .MuiButton-endIcon': { + marginLeft: '10px', + marginRight: 0 + }, + '& .MuiButton-endIcon svg': { + color: disabled ? '#BEAAD84D' : '#BEAAD8' + } + }; + const renderText = useMemo(() => { if (typeof text === 'string') { return @@ -88,32 +133,37 @@ export default function ActionButton ({ StartIcon, contentPlacement = 'start', d return (