From 01cf2992b6b2dc56a2fdc70a8f17b4f3285daa85 Mon Sep 17 00:00:00 2001 From: slowbackspace Date: Tue, 30 Apr 2019 11:53:40 +0200 Subject: [PATCH 1/7] upgrade tuc to beta17 --- package.json | 2 +- src/components/Header/index.js | 2 ++ yarn.lock | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 00223014..a048049a 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "styled-normalize": "^8.0.6", "trezor-bridge-communicator": "1.0.2", "trezor-connect": "7.0.2", - "trezor-ui-components": "^1.0.0-beta.15", + "trezor-ui-components": "^1.0.0-beta.17", "wallet-address-validator": "^0.2.4", "web3": "1.0.0-beta.35", "webpack": "^4.29.3", diff --git a/src/components/Header/index.js b/src/components/Header/index.js index 668f7d08..622bc178 100644 --- a/src/components/Header/index.js +++ b/src/components/Header/index.js @@ -3,6 +3,7 @@ import * as React from 'react'; import { Header } from 'trezor-ui-components'; import { FormattedMessage } from 'react-intl'; +import { Link } from 'react-router-dom'; import type { toggleSidebar as toggleSidebarType } from 'actions/WalletActions'; import l10nMessages from './index.messages'; @@ -40,6 +41,7 @@ const MyHeader = ({ sidebarEnabled, sidebarOpened, toggleSidebar }: MyProps) => title: , }, ]} + logoLinkComponent={} rightAddon={} /> ); diff --git a/yarn.lock b/yarn.lock index a09431ac..0e00340e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11204,10 +11204,10 @@ trezor-translations-manager@^1.0.5: request "^2.88.0" request-promise-native "^1.0.5" -trezor-ui-components@^1.0.0-beta.15: - version "1.0.0-beta.15" - resolved "https://registry.yarnpkg.com/trezor-ui-components/-/trezor-ui-components-1.0.0-beta.15.tgz#936c72b67ed324e5fdac292f50055e8f4ce53290" - integrity sha512-Vp6iyRcwSfN+zxRlzbZTfmS8xBk/ERpHs16uxof5o05CGppZb6X0rMpWfauOb05k/fMwH8owPWKs1F+D6J2mLQ== +trezor-ui-components@^1.0.0-beta.17: + version "1.0.0-beta.17" + resolved "https://registry.yarnpkg.com/trezor-ui-components/-/trezor-ui-components-1.0.0-beta.17.tgz#64237729e243f0181bde2b066c9450bf936e35fc" + integrity sha512-pk06TF6tj0bO18knmUpdHUC3mZCtN17mPKwAk9j0iR6vQ+nTnqMdp88zgy4wERlBtied1UO5cd66qRhTLGa5Ww== dependencies: "@tippy.js/react" "^2.1.1" prop-types "^15.7.2" From 14fe1d82ebfb7ece6cae1020c6c558873833675a Mon Sep 17 00:00:00 2001 From: slowbackspace Date: Thu, 2 May 2019 14:00:24 +0200 Subject: [PATCH 2/7] change notification prop type to variant --- src/actions/DiscoveryActions.js | 4 +-- src/actions/ImportAccountActions.js | 6 ++--- src/actions/NotificationActions.js | 2 +- src/actions/ReceiveActions.js | 2 +- src/actions/SelectedAccountActions.js | 4 +++ src/actions/SignVerifyActions.js | 6 ++--- src/actions/TrezorConnectActions.js | 3 ++- src/actions/ethereum/SendFormActions.js | 6 ++--- src/actions/ripple/SendFormActions.js | 6 ++--- .../App/components/NoBackup/index.js | 2 +- .../App/components/OnlineStatus/index.js | 2 +- .../App/components/UpdateBridge/index.js | 2 +- .../App/components/UpdateFirmware/index.js | 2 +- .../Context/components/Account/index.js | 4 +-- .../components/Group/index.js | 12 ++++----- .../components/NotificationsGroups/index.js | 27 ++++++++++--------- .../Context/components/Static/index.js | 6 ++--- src/reducers/NotificationReducer.js | 4 +-- src/reducers/SelectedAccountReducer.js | 2 +- .../components/InitializationError/index.js | 2 +- src/views/Wallet/views/Acquire/index.js | 2 +- .../Wallet/views/UnreadableDevice/index.js | 2 +- 22 files changed, 58 insertions(+), 50 deletions(-) diff --git a/src/actions/DiscoveryActions.js b/src/actions/DiscoveryActions.js index d61f2085..154de83c 100644 --- a/src/actions/DiscoveryActions.js +++ b/src/actions/DiscoveryActions.js @@ -175,7 +175,7 @@ const begin = (device: TrezorDevice, networkName: string): AsyncAction => async dispatch({ type: NOTIFICATION.ADD, payload: { - type: 'error', + variant: 'error', title: 'Discovery error', message: error.message, cancelable: true, @@ -263,7 +263,7 @@ const discoverAccount = (device: TrezorDevice, discoveryProcess: Discovery): Asy dispatch({ type: NOTIFICATION.ADD, payload: { - type: 'error', + variant: 'error', title: 'Account discovery error', message: error.message, cancelable: true, diff --git a/src/actions/ImportAccountActions.js b/src/actions/ImportAccountActions.js index 5e673f60..91a16277 100644 --- a/src/actions/ImportAccountActions.js +++ b/src/actions/ImportAccountActions.js @@ -80,7 +80,7 @@ export const importAddress = ( dispatch({ type: NOTIFICATION.ADD, payload: { - type: 'success', + variant: 'success', title: 'The account has been successfully imported', cancelable: true, }, @@ -132,7 +132,7 @@ export const importAddress = ( dispatch({ type: NOTIFICATION.ADD, payload: { - type: 'success', + variant: 'success', title: 'The account has been successfully imported', cancelable: true, }, @@ -147,7 +147,7 @@ export const importAddress = ( dispatch({ type: NOTIFICATION.ADD, payload: { - type: 'error', + variant: 'error', title: 'Import account error', message: error.message, cancelable: true, diff --git a/src/actions/NotificationActions.js b/src/actions/NotificationActions.js index 48e2706e..35ea0c18 100644 --- a/src/actions/NotificationActions.js +++ b/src/actions/NotificationActions.js @@ -9,7 +9,7 @@ export type NotificationAction = | { type: typeof NOTIFICATION.ADD, payload: { - +type: string, + +variant: string, +title: React.Node | string, +message?: ?(React.Node | string), +cancelable: boolean, diff --git a/src/actions/ReceiveActions.js b/src/actions/ReceiveActions.js index 867f7e2a..bbb5d247 100644 --- a/src/actions/ReceiveActions.js +++ b/src/actions/ReceiveActions.js @@ -111,7 +111,7 @@ export const showAddress = (path: Array): AsyncAction => async ( dispatch({ type: NOTIFICATION.ADD, payload: { - type: 'error', + variant: 'error', title: 'Verifying address error', message: response.payload.error, cancelable: true, diff --git a/src/actions/SelectedAccountActions.js b/src/actions/SelectedAccountActions.js index 75ef722d..a0459b9f 100644 --- a/src/actions/SelectedAccountActions.js +++ b/src/actions/SelectedAccountActions.js @@ -139,6 +139,7 @@ const getAccountNotification = ( if (blockchain && !blockchain.connected) { return { type: 'backend', + variant: 'error', title: `${network.name} backend is not connected`, shouldRender: false, }; @@ -148,6 +149,7 @@ const getAccountNotification = ( if (account && discovery && !discovery.completed && !discovery.waitingForDevice) { return { type: 'info', + variant: 'info', title: 'Loading other accounts...', shouldRender: true, }; @@ -157,6 +159,7 @@ const getAccountNotification = ( if (!device.connected) { return { type: 'info', + variant: 'info', title: `Device ${device.instanceLabel} is disconnected`, shouldRender: true, }; @@ -167,6 +170,7 @@ const getAccountNotification = ( if (!device.available) { return { type: 'info', + variant: 'info', title: `Device ${device.instanceLabel} is unavailable`, message: 'Change passphrase settings to use this device', shouldRender: true, diff --git a/src/actions/SignVerifyActions.js b/src/actions/SignVerifyActions.js index 8fc3982f..ecfe784b 100644 --- a/src/actions/SignVerifyActions.js +++ b/src/actions/SignVerifyActions.js @@ -64,7 +64,7 @@ const sign = (path: Array, message: string, hex: boolean = false): Async dispatch({ type: NOTIFICATION.ADD, payload: { - type: 'error', + variant: 'error', title: 'Sign error', message: response.payload.error, cancelable: true, @@ -109,7 +109,7 @@ const verify = ( dispatch({ type: NOTIFICATION.ADD, payload: { - type: 'success', + variant: 'success', title: 'Verify success', message: 'signature is valid', cancelable: true, @@ -119,7 +119,7 @@ const verify = ( dispatch({ type: NOTIFICATION.ADD, payload: { - type: 'error', + variant: 'error', title: 'Verify error', message: response.payload.error, cancelable: true, diff --git a/src/actions/TrezorConnectActions.js b/src/actions/TrezorConnectActions.js index 0b5ce5f2..bfa52881 100644 --- a/src/actions/TrezorConnectActions.js +++ b/src/actions/TrezorConnectActions.js @@ -263,7 +263,7 @@ export const authorizeDevice = (): AsyncAction => async ( type: NOTIFICATION.ADD, payload: { devicePath: selected.path, - type: 'error', + variant: 'error', title: 'Authentication error', message: response.payload.error, cancelable: false, @@ -350,6 +350,7 @@ export function acquire(): AsyncAction { type: NOTIFICATION.ADD, payload: { type: 'error', + variant: 'error', title: 'Acquire device error', message: response.payload.error, cancelable: true, diff --git a/src/actions/ethereum/SendFormActions.js b/src/actions/ethereum/SendFormActions.js index c1983404..094a9158 100644 --- a/src/actions/ethereum/SendFormActions.js +++ b/src/actions/ethereum/SendFormActions.js @@ -716,7 +716,7 @@ export const onSend = (): AsyncAction => async ( dispatch({ type: NOTIFICATION.ADD, payload: { - type: 'error', + variant: 'error', title: 'Transaction error', message: signedTransaction.payload.error, cancelable: true, @@ -806,7 +806,7 @@ export const onSend = (): AsyncAction => async ( dispatch({ type: NOTIFICATION.ADD, payload: { - type: 'success', + variant: 'success', title: 'Transaction success', message: ( @@ -821,7 +821,7 @@ export const onSend = (): AsyncAction => async ( dispatch({ type: NOTIFICATION.ADD, payload: { - type: 'error', + variant: 'error', title: 'Transaction error', message: error.message || error, cancelable: true, diff --git a/src/actions/ripple/SendFormActions.js b/src/actions/ripple/SendFormActions.js index 41c34fdc..302d0051 100644 --- a/src/actions/ripple/SendFormActions.js +++ b/src/actions/ripple/SendFormActions.js @@ -454,7 +454,7 @@ export const onSend = (): AsyncAction => async ( dispatch({ type: NOTIFICATION.ADD, payload: { - type: 'error', + variant: 'error', title: 'Transaction error', message: signedTransaction.payload.error, cancelable: true, @@ -473,7 +473,7 @@ export const onSend = (): AsyncAction => async ( dispatch({ type: NOTIFICATION.ADD, payload: { - type: 'error', + variant: 'error', title: 'Transaction error', message: push.payload.error, cancelable: true, @@ -496,7 +496,7 @@ export const onSend = (): AsyncAction => async ( dispatch({ type: NOTIFICATION.ADD, payload: { - type: 'success', + variant: 'success', title: 'Transaction success', message: txid, cancelable: true, diff --git a/src/components/notifications/App/components/NoBackup/index.js b/src/components/notifications/App/components/NoBackup/index.js index bbe7ffb1..6d6846d3 100644 --- a/src/components/notifications/App/components/NoBackup/index.js +++ b/src/components/notifications/App/components/NoBackup/index.js @@ -13,7 +13,7 @@ export default (props: Props) => { return ( } message={} actions={[ diff --git a/src/components/notifications/App/components/OnlineStatus/index.js b/src/components/notifications/App/components/OnlineStatus/index.js index 529c40a1..5002ee67 100644 --- a/src/components/notifications/App/components/OnlineStatus/index.js +++ b/src/components/notifications/App/components/OnlineStatus/index.js @@ -11,7 +11,7 @@ export default (props: Props) => { return ( diff --git a/src/components/notifications/App/components/UpdateBridge/index.js b/src/components/notifications/App/components/UpdateBridge/index.js index d5bb1131..1e451bd1 100644 --- a/src/components/notifications/App/components/UpdateBridge/index.js +++ b/src/components/notifications/App/components/UpdateBridge/index.js @@ -11,7 +11,7 @@ export default (props: Props) => { return ( { return ( { // TODO: this is a different component with "auto resolve" button return ( { } return ( diff --git a/src/components/notifications/Context/components/Action/components/NotificationsGroups/components/Group/index.js b/src/components/notifications/Context/components/Action/components/NotificationsGroups/components/Group/index.js index 8f5e135c..db6dde68 100644 --- a/src/components/notifications/Context/components/Action/components/NotificationsGroups/components/Group/index.js +++ b/src/components/notifications/Context/components/Action/components/NotificationsGroups/components/Group/index.js @@ -65,17 +65,17 @@ class Group extends PureComponent { }; render() { - const { type, groupNotifications, close } = this.props; - const color = getPrimaryColor(type); + const { variant, groupNotifications, close } = this.props; + const color = getPrimaryColor(variant); return ( {groupNotifications.length > 1 && (
- + {groupNotifications.length}{' '} - {groupNotifications.length > 1 ? `${type}s` : type} + {groupNotifications.length > 1 ? `${variant}s` : variant} @@ -93,7 +93,7 @@ class Group extends PureComponent { {groupNotifications.slice(0, this.state.visibleCount).map(notification => ( notifications.reduce((acc, obj) => { - const key = obj.type; + const key = obj.variant; if (!acc[key]) { acc[key] = []; } @@ -20,6 +20,7 @@ class NotificationsGroup extends PureComponent { }, {}); sortByPriority(notifications) { + //TODO return notifications; } @@ -29,51 +30,53 @@ class NotificationsGroup extends PureComponent { // { // key: 1, // title: 'this is a title of error notification', - // type: 'error', + // variant: 'error', // message: 'this is a message of error notification', // }, // { // key: 2, // title: 'this is a title of warning notification', - // type: 'warning', + // variant: 'warning', // message: 'this is a message of warning notification', // }, // { // key: 3, // title: 'this is a title of warning notification', - // type: 'warning', + // variant: 'warning', // message: 'this is a message of warning notification', // }, // { // key: 4, // title: 'this is a title of warning notification sds d', - // type: 'warning', + // variant: 'warning', // message: 'this is a message of warning notification', // }, // { // key: 5, // title: 'this is a title of warning notification as', - // type: 'success', + // variant: 'success', // }, // { // key: 6, // title: 'this is a title of warning notification as', - // type: 'info', + // variant: 'info', // message: 'this is a message of warning notification', // }, // { // key: 7, // title: 'this is a title of info notification s ', - // type: 'info', + // variant: 'info', // message: 'this is a message of info notification', - // actions: - // [{ + // actions: [ + // { // label: 'Update', // callback: 'props.routerActions.gotoBridgeUpdate', - // }], + // }, + // ], // }, // ]; const notificationGroups = this.groupNotifications(notifications); + console.log(notificationGroups); const sortedNotifications = this.sortByPriority(notificationGroups); return ( @@ -82,7 +85,7 @@ class NotificationsGroup extends PureComponent { ))} diff --git a/src/components/notifications/Context/components/Static/index.js b/src/components/notifications/Context/components/Static/index.js index d14c5aa0..fa30ff68 100644 --- a/src/components/notifications/Context/components/Static/index.js +++ b/src/components/notifications/Context/components/Static/index.js @@ -30,7 +30,7 @@ export default withRouter((props: {| ...Props, ...ContextRouter |}) => { notifications.push( } @@ -61,7 +61,7 @@ export default withRouter((props: {| ...Props, ...ContextRouter |}) => { notifications.push( @@ -72,7 +72,7 @@ export default withRouter((props: {| ...Props, ...ContextRouter |}) => { notifications.push( diff --git a/src/reducers/NotificationReducer.js b/src/reducers/NotificationReducer.js index 5e3691cc..e9275e6f 100644 --- a/src/reducers/NotificationReducer.js +++ b/src/reducers/NotificationReducer.js @@ -16,7 +16,7 @@ export type NotificationEntry = { +key: string, // React.Key +id: ?string, +devicePath: ?string, - +type: string, + +variant: string, +title: React.Node | string, +message: ?(React.Node | string), +cancelable: boolean, @@ -42,7 +42,7 @@ const addNotification = (state: State, payload: any): State => { key: new Date().getTime().toString(), id: payload.id, devicePath: payload.devicePath, - type: payload.type, + variant: payload.variant, title: payload.title, message: payload.message, cancelable: payload.cancelable, diff --git a/src/reducers/SelectedAccountReducer.js b/src/reducers/SelectedAccountReducer.js index 4ae2fa08..ee58ab0e 100644 --- a/src/reducers/SelectedAccountReducer.js +++ b/src/reducers/SelectedAccountReducer.js @@ -10,7 +10,7 @@ export type Loader = { }; export type Notification = { - type: string, + variant: string, title: string, message?: string, }; diff --git a/src/views/Landing/components/InitializationError/index.js b/src/views/Landing/components/InitializationError/index.js index bb19573f..f39bc2e9 100644 --- a/src/views/Landing/components/InitializationError/index.js +++ b/src/views/Landing/components/InitializationError/index.js @@ -13,7 +13,7 @@ const InitializationError = (props: { error: string }) => ( diff --git a/src/views/Wallet/views/Acquire/index.js b/src/views/Wallet/views/Acquire/index.js index 8e84263f..de2dede0 100644 --- a/src/views/Wallet/views/Acquire/index.js +++ b/src/views/Wallet/views/Acquire/index.js @@ -37,7 +37,7 @@ const Acquire = (props: Props) => ( ( From 7ab397807866c75b7d715cbaa96b42c63e50a82b Mon Sep 17 00:00:00 2001 From: slowbackspace Date: Thu, 2 May 2019 14:05:24 +0200 Subject: [PATCH 3/7] rename trezorAction to tooltipAction --- src/views/Wallet/views/Account/Receive/ethereum/index.js | 4 ++-- src/views/Wallet/views/Account/Receive/ripple/index.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/Wallet/views/Account/Receive/ethereum/index.js b/src/views/Wallet/views/Account/Receive/ethereum/index.js index c5813bf0..044a7e0c 100644 --- a/src/views/Wallet/views/Account/Receive/ethereum/index.js +++ b/src/views/Wallet/views/Account/Receive/ethereum/index.js @@ -78,7 +78,7 @@ const QrWrapper = styled.div` `; const StyledDeviceIcon = styled(DeviceIcon)` - margin: 0 6px; + margin-right: 6px; `; const AccountReceive = (props: Props) => { @@ -118,7 +118,7 @@ const AccountReceive = (props: Props) => { topLabel={props.intl.formatMessage(l10nCommonMessages.TR_ADDRESS)} value={address} isPartiallyHidden={isAddressHidden} - trezorAction={ + tooltipAction={ isAddressVerifying ? ( { @@ -124,7 +124,7 @@ const AccountReceive = (props: Props) => { topLabel={props.intl.formatMessage(l10nCommonMessages.TR_ADDRESS)} value={address} isPartiallyHidden={isAddressHidden} - trezorAction={ + tooltipAction={ isAddressVerifying ? ( Date: Thu, 2 May 2019 14:29:03 +0200 Subject: [PATCH 4/7] adjust Log bg color --- src/components/Log/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Log/index.js b/src/components/Log/index.js index acd51053..7993bd6d 100644 --- a/src/components/Log/index.js +++ b/src/components/Log/index.js @@ -28,7 +28,7 @@ type Props = {| ...OwnProps, ...StateProps, ...DispatchProps |}; const Wrapper = styled.div` position: relative; color: ${colors.INFO_PRIMARY}; - background: ${colors.INFO_SECONDARY}; + background: ${colors.INFO_LIGHT}; padding: 24px; display: flex; flex-direction: column; From e63bc301e6284b0a1fbc33189444de723a292161 Mon Sep 17 00:00:00 2001 From: slowbackspace Date: Thu, 2 May 2019 14:29:29 +0200 Subject: [PATCH 5/7] update to new buttons --- .../modals/confirm/NoBackup/index.js | 18 ++------------- .../modals/confirm/UnverifiedAddress/index.js | 22 +++++-------------- src/views/Wallet/views/Import/index.js | 1 + 3 files changed, 9 insertions(+), 32 deletions(-) diff --git a/src/components/modals/confirm/NoBackup/index.js b/src/components/modals/confirm/NoBackup/index.js index 2bd46830..37b1b840 100644 --- a/src/components/modals/confirm/NoBackup/index.js +++ b/src/components/modals/confirm/NoBackup/index.js @@ -36,20 +36,6 @@ const BackupButton = styled(Button)` margin-bottom: 10px; `; -const ProceedButton = styled(Button)` - background: transparent; - border-color: ${colors.WARNING_PRIMARY}; - color: ${colors.WARNING_PRIMARY}; - - &:focus, - &:hover, - &:active { - color: ${colors.WHITE}; - background: ${colors.WARNING_PRIMARY}; - box-shadow: none; - } -`; - const StyledP = styled(P)` /* boost-specificity hack to override P base styling */ && { @@ -80,9 +66,9 @@ const Confirmation = (props: Props) => ( - props.onReceiveConfirmation(true)}> + ); diff --git a/src/components/modals/confirm/UnverifiedAddress/index.js b/src/components/modals/confirm/UnverifiedAddress/index.js index fb7789f7..09256c97 100644 --- a/src/components/modals/confirm/UnverifiedAddress/index.js +++ b/src/components/modals/confirm/UnverifiedAddress/index.js @@ -64,20 +64,6 @@ const BackupButton = styled(Button)` width: 100%; `; -const WarnButton = styled(Button)` - background: transparent; - border-color: ${colors.WARNING_PRIMARY}; - color: ${colors.WARNING_PRIMARY}; - - &:focus, - &:hover, - &:active { - color: ${colors.WHITE}; - background: ${colors.WARNING_PRIMARY}; - box-shadow: none; - } -`; - class ConfirmUnverifiedAddress extends PureComponent { componentDidMount(): void { this.keyboardHandler = this.keyboardHandler.bind(this); @@ -161,9 +147,13 @@ class ConfirmUnverifiedAddress extends PureComponent { - this.showUnverifiedAddress()}> + {needsBackup && } diff --git a/src/views/Wallet/views/Import/index.js b/src/views/Wallet/views/Import/index.js index f58a8518..ad5473d9 100644 --- a/src/views/Wallet/views/Import/index.js +++ b/src/views/Wallet/views/Import/index.js @@ -86,6 +86,7 @@ const Import = (props: Props) => { isDisabled={ !selectedNetwork || address === '' || props.importAccount.loading } + isLoading={props.importAccount.loading} onClick={() => props.importAddress( address, From d8f0b341d97ae3cf946697a8e5db314d85bf2543 Mon Sep 17 00:00:00 2001 From: slowbackspace Date: Thu, 2 May 2019 14:33:27 +0200 Subject: [PATCH 6/7] update notification utils --- src/utils/__tests__/notification.test.js | 14 +++++++------- src/utils/notification.js | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/utils/__tests__/notification.test.js b/src/utils/__tests__/notification.test.js index c2ef912d..176c6a80 100644 --- a/src/utils/__tests__/notification.test.js +++ b/src/utils/__tests__/notification.test.js @@ -11,13 +11,13 @@ describe('notification utils', () => { expect(utils.getPrimaryColor('')).toBe(null); }); - it('get secondary color from status', () => { - expect(utils.getSecondaryColor('info')).toBe(colors.INFO_SECONDARY); - expect(utils.getSecondaryColor('warning')).toBe(colors.WARNING_SECONDARY); - expect(utils.getSecondaryColor('error')).toBe(colors.ERROR_SECONDARY); - expect(utils.getSecondaryColor('success')).toBe(colors.SUCCESS_SECONDARY); - expect(utils.getSecondaryColor('kdsjflds')).toBe(null); - expect(utils.getSecondaryColor('')).toBe(null); + it('get notification bg color from status', () => { + expect(utils.getNotificationBgColor('info')).toBe(colors.INFO_LIGHT); + expect(utils.getNotificationBgColor('warning')).toBe(colors.WARNING_LIGHT); + expect(utils.getNotificationBgColor('error')).toBe(colors.ERROR_LIGHT); + expect(utils.getNotificationBgColor('success')).toBe(colors.SUCCESS_LIGHT); + expect(utils.getNotificationBgColor('kdsjflds')).toBe(null); + expect(utils.getNotificationBgColor('')).toBe(null); }); it('get icon according to status', () => { diff --git a/src/utils/notification.js b/src/utils/notification.js index 884a6dd8..2e9c62e8 100644 --- a/src/utils/notification.js +++ b/src/utils/notification.js @@ -22,20 +22,20 @@ const getPrimaryColor = type => { return color; }; -const getSecondaryColor = type => { +const getNotificationBgColor = type => { let color; switch (type) { case 'info': - color = colors.INFO_SECONDARY; + color = colors.INFO_LIGHT; break; case 'error': - color = colors.ERROR_SECONDARY; + color = colors.ERROR_LIGHT; break; case 'warning': - color = colors.WARNING_SECONDARY; + color = colors.WARNING_LIGHT; break; case 'success': - color = colors.SUCCESS_SECONDARY; + color = colors.SUCCESS_LIGHT; break; default: color = null; @@ -46,4 +46,4 @@ const getSecondaryColor = type => { const getIcon = type => icons[type.toUpperCase()]; -export { getPrimaryColor, getSecondaryColor, getIcon }; +export { getPrimaryColor, getNotificationBgColor, getIcon }; From 50dcdd352b0821b6554a6ce4c22abdb58b0a69d7 Mon Sep 17 00:00:00 2001 From: slowbackspace Date: Thu, 2 May 2019 15:00:16 +0200 Subject: [PATCH 7/7] upgrade tuc to beta 18 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a048049a..3c632632 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "styled-normalize": "^8.0.6", "trezor-bridge-communicator": "1.0.2", "trezor-connect": "7.0.2", - "trezor-ui-components": "^1.0.0-beta.17", + "trezor-ui-components": "^1.0.0-beta.18", "wallet-address-validator": "^0.2.4", "web3": "1.0.0-beta.35", "webpack": "^4.29.3", diff --git a/yarn.lock b/yarn.lock index 0e00340e..dfb730d3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11204,10 +11204,10 @@ trezor-translations-manager@^1.0.5: request "^2.88.0" request-promise-native "^1.0.5" -trezor-ui-components@^1.0.0-beta.17: - version "1.0.0-beta.17" - resolved "https://registry.yarnpkg.com/trezor-ui-components/-/trezor-ui-components-1.0.0-beta.17.tgz#64237729e243f0181bde2b066c9450bf936e35fc" - integrity sha512-pk06TF6tj0bO18knmUpdHUC3mZCtN17mPKwAk9j0iR6vQ+nTnqMdp88zgy4wERlBtied1UO5cd66qRhTLGa5Ww== +trezor-ui-components@^1.0.0-beta.18: + version "1.0.0-beta.18" + resolved "https://registry.yarnpkg.com/trezor-ui-components/-/trezor-ui-components-1.0.0-beta.18.tgz#2408dbdedc83e986abcde9d8b2aec3ec37bbdc43" + integrity sha512-mwS7dqrAUto25ytZpF9K2BQpjTBH78/PJjHVGBoZrLJkONogqOvCCdIbkrUSkNR+ZTep4MoxDF3ZN7SXGsFr+g== dependencies: "@tippy.js/react" "^2.1.1" prop-types "^15.7.2"