1
0
mirror of https://github.com/trezor/trezor-wallet synced 2025-07-16 11:38:19 +00:00

Show loader after 'Acquire Device' button is clicked and is waiting for acquire

This commit is contained in:
Vasek Mlejnsky 2018-08-02 15:19:26 +02:00
parent 250141236b
commit cd4d7ed6b1
5 changed files with 72 additions and 25 deletions

View File

@ -3,14 +3,22 @@
import React from 'react';
export default (props: { size: string, label?: string }): React$Element<string> => {
type Props = {
size: string,
label?: string,
className?: string,
};
export default (props: Props): React$Element<string> => {
const className = props.className ? `loader-circle ${props.className}` : 'loader-circle';
const style = {
width: `${props.size}px`,
height: `${props.size}px`,
};
}
return (
<div className="loader-circle" style={style}>
<div className={ className } style={ style }>
<p>{ props.label }</p>
<svg className="circular" viewBox="25 25 50 50">
<circle className="route" cx="50" cy="50" r="20" fill="none" stroke="" strokeWidth="1" strokeMiterlimit="10" />

View File

@ -5,6 +5,8 @@ import React from 'react';
import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
import Loader from '../common/LoaderCircle';
import * as NOTIFICATION from '~/js/actions/constants/notification';
import * as NotificationActions from '~/js/actions/NotificationActions';
import type { Action, State, Dispatch } from '~/flowtype';
@ -21,7 +23,8 @@ type NProps = {
title: string;
message?: string;
actions?: Array<any>;
close?: typeof NotificationActions.close
close?: typeof NotificationActions.close,
loading?: boolean;
}
export const Notification = (props: NProps): React$Element<string> => {
@ -48,6 +51,11 @@ export const Notification = (props: NProps): React$Element<string> => {
{ actionButtons }
</div>
) : null }
{ props.loading ? (
<Loader
className="info"
size="50" />
) : null }
</div>
);

View File

@ -23,16 +23,32 @@ const Acquire = (props: Props) => {
},
},
];
const acquireDeviceAction = {
label: 'Acquire device',
callback: () => {
props.acquireDevice()
}
};
return (
<section className="acquire">
{props.acquiring ? (
<Notification
title="Device is being acquired"
message="Please wait"
className="loading"
cancelable={false}
loading={true}
/>
) : (
<Notification
title="Device is used in other window"
message="Do you want to use your device in this window?"
className="info"
cancelable={false}
actions={actions}
cancelable={ false }
actions={ [acquireDeviceAction] }
/>
)}
</section>
);
};

View File

@ -34,11 +34,11 @@
stroke-linecap: round;
}
}
}
@keyframes rotate {
100% {
transform: rotate(360deg);
&.info {
.path {
animation: dash 1.5s ease-in-out infinite, colorInfo 6s ease-in-out infinite;
}
}
}
@ -71,3 +71,18 @@
stroke: @color_green_tertiary;
}
}
@keyframes colorInfo {
100%, 0% {
stroke: @color_info_primary;
}
40% {
stroke: @color_info_primary;
}
66% {
stroke: @color_info_primary;
}
80%, 90% {
stroke: @color_info_primary;
}
}