arno
/
trezor-wallet
mirror of https://github.com/trezor/trezor-wallet
1
0
Fork 0
Code Issues Releases Wiki Activity

change notification prop type to variant

Browse Source
pull/543/head
slowbackspace 5 years ago
parent 01cf2992b6
commit 14fe1d82eb
22 changed files with 58 additions and 50 deletions
Show Stats Download Patch File Download Diff File

4
src/actions/DiscoveryActions.js
Unescape View File

@ -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,

6
src/actions/ImportAccountActions.js
Unescape View File

@ -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,

2
src/actions/NotificationActions.js
Unescape View File

@ -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,

2
src/actions/ReceiveActions.js
Unescape View File

@ -111,7 +111,7 @@ export const showAddress = (path: Array<number>): AsyncAction => async (
dispatch({
type: NOTIFICATION.ADD,
payload: {
type: 'error',
variant: 'error',
title: 'Verifying address error',
message: response.payload.error,
cancelable: true,

4
src/actions/SelectedAccountActions.js
Unescape View File

@ -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,

6
src/actions/SignVerifyActions.js
Unescape View File

@ -64,7 +64,7 @@ const sign = (path: Array<number>, 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,

3
src/actions/TrezorConnectActions.js
Unescape View File

@ -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,

6
src/actions/ethereum/SendFormActions.js
Unescape View File

@ -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: (
<Link href={`${network.explorer.tx}${txid}`} isGreen>
@ -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,

6
src/actions/ripple/SendFormActions.js
Unescape View File

@ -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,

2
src/components/notifications/App/components/NoBackup/index.js
Unescape View File

@ -13,7 +13,7 @@ export default (props: Props) => {
return (
<Notification
key="no-backup"
type="warning"
variant="warning"
title={<FormattedMessage {...l10nCommonMessages.TR_YOUR_TREZOR_IS_NOT_BACKED_UP} />}
message={<FormattedMessage {...l10nCommonMessages.TR_IF_YOUR_DEVICE_IS_EVER_LOST} />}
actions={[

2
src/components/notifications/App/components/OnlineStatus/index.js
Unescape View File

@ -11,7 +11,7 @@ export default (props: Props) => {
return (
<Notification
key="wallet-offline"
type="error"
variant="error"
title={props.intl.formatMessage(l10nMessages.TR_YOU_WERE_DISCONNECTED_DOT)}
message={props.intl.formatMessage(l10nMessages.TR_PLEASE_RELOAD_THE_PAGE_DOT)}
/>

2
src/components/notifications/App/components/UpdateBridge/index.js
Unescape View File

@ -11,7 +11,7 @@ export default (props: Props) => {
return (
<Notification
key="update-bridge"
type="warning"
variant="warning"
title={props.intl.formatMessage(l10nMessages.TR_NEW_TREZOR_BRIDGE_IS_AVAILABLE)}
message={props.intl.formatMessage(
l10nCommonMessages.TR_UPGRADE_FOR_THE_NEWEST_FEATURES_DOT

2
src/components/notifications/App/components/UpdateFirmware/index.js
Unescape View File

@ -28,7 +28,7 @@ const UpdateFirmware = (props: {| ...Props, ...ContextRouter |}) => {
return (
<Notification
key="update-firmware"
type="warning"
variant="warning"
title={props.intl.formatMessage(l10nMessages.TR_NEW_TREZOR_FIRMWARE_IS_AVAILABLE_DOT)}
message={props.intl.formatMessage(
l10nCommonMessages.TR_UPGRADE_FOR_THE_NEWEST_FEATURES_DOT

4
src/components/notifications/Context/components/Account/index.js
Unescape View File

@ -16,7 +16,7 @@ export default (props: Props) => {
// TODO: this is a different component with "auto resolve" button
return (
<Notification
type="error"
variant="error"
title={notification.title}
message={notification.message}
isActionInProgress={blockchain && blockchain.connecting}
@ -33,7 +33,7 @@ export default (props: Props) => {
}
return (
<Notification
type={notification.type}
variant={notification.variant}
title={notification.title}
message={notification.message}
/>

12
src/components/notifications/Context/components/Action/components/NotificationsGroups/components/Group/index.js
Unescape View File

@ -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 (
<Wrapper>
{groupNotifications.length > 1 && (
<Header onClick={this.toggle}>
<Left>
<StyledIcon color={color} size={16} icon={getIcon(type)} />
<StyledIcon color={color} size={16} icon={getIcon(variant)} />
<Title color={color}>
{groupNotifications.length}{' '}
{groupNotifications.length > 1 ? `${type}s` : type}
{groupNotifications.length > 1 ? `${variant}s` : variant}
</Title>
</Left>
<Right>
@ -93,7 +93,7 @@ class Group extends PureComponent {
{groupNotifications.slice(0, this.state.visibleCount).map(notification => (
<StyledNotification
key={notification.key}
type={notification.type}
variant={notification.variant}
title={notification.title}
message={notification.message}
cancelable={notification.cancelable}
@ -108,7 +108,7 @@ class Group extends PureComponent {
}
Group.propTypes = {
type: PropTypes.string,
variant: PropTypes.string,
close: PropTypes.func.isRequired,
groupNotifications: PropTypes.arrayOf(
PropTypes.shape({

27
src/components/notifications/Context/components/Action/components/NotificationsGroups/index.js
Unescape View File

@ -11,7 +11,7 @@ const Wrapper = styled.div`
class NotificationsGroup extends PureComponent {
groupNotifications = notifications =>
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 {
<Group
key={group}
groupNotifications={notificationGroups[group]}
type={group}
variant={group}
close={close}
/>
))}

6
src/components/notifications/Context/components/Static/index.js
Unescape View File

@ -30,7 +30,7 @@ export default withRouter<Props>((props: {| ...Props, ...ContextRouter |}) => {
notifications.push(
<Notification
key="xrp-warning"
type="warning"
variant="warning"
title={
<FormattedMessage {...l10nMessages.TR_MINIMUM_ACCOUNT_RESERVE_REQUIRED} />
}
@ -61,7 +61,7 @@ export default withRouter<Props>((props: {| ...Props, ...ContextRouter |}) => {
notifications.push(
<Notification
key="import-warning"
type="warning"
variant="warning"
title="Use at your own risk"
message="This is an advanced interface intended for developer use only. Never use this process unless you really know what you are doing."
/>
@ -72,7 +72,7 @@ export default withRouter<Props>((props: {| ...Props, ...ContextRouter |}) => {
notifications.push(
<Notification
key="watch-only-info"
type="info"
variant="info"
title="The account is watch-only"
message="A watch-only account is a public address you’ve imported into your wallet, allowing the wallet to watch for outputs but not spend them."
/>

4
src/reducers/NotificationReducer.js
Unescape View File

@ -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,

2
src/reducers/SelectedAccountReducer.js
Unescape View File

@ -10,7 +10,7 @@ export type Loader = {
};
export type Notification = {
type: string,
variant: string,
title: string,
message?: string,
};

2
src/views/Landing/components/InitializationError/index.js
Unescape View File

@ -13,7 +13,7 @@ const InitializationError = (props: { error: string }) => (
<Notification
title="Initialization error"
message={props.error}
type="error"
variant="error"
cancelable={false}
/>
</Wrapper>

2
src/views/Wallet/views/Acquire/index.js
Unescape View File

@ -37,7 +37,7 @@ const Acquire = (props: Props) => (
<Notification
title={props.intl.formatMessage(l10nMessages.TR_DEVICE_USED_IN_OTHER)}
message={props.intl.formatMessage(l10nMessages.TR_USE_YOUR_DEVICE_IN_THIS_WINDOW)}
type="info"
variant="info"
cancelable={false}
isActionInProgress={props.acquiring}
actions={[

2
src/views/Wallet/views/UnreadableDevice/index.js
Unescape View File

@ -14,7 +14,7 @@ const UnreadableDevice = ({ intl }: { intl: IntlShape }) => (
<Notification
title={intl.formatMessage(l10nMessages.TR_UNREADABLE_DEVICE)}
message={intl.formatMessage(l10nMessages.TR_PLEASE_INSTALL_TREZOR_BRIDGE)}
type="error"
variant="error"
cancelable={false}
/>
</Wrapper>

Write Preview
Loading…
Cancel
Save