diff --git a/src/actions/constants/signVerify.js b/src/actions/constants/signVerify.js index 8b939512..4bd14209 100644 --- a/src/actions/constants/signVerify.js +++ b/src/actions/constants/signVerify.js @@ -1,5 +1,5 @@ /* @flow */ - export const SIGN_SUCCESS: 'sign__verify__sign__success' = 'sign__verify__sign__success'; export const SIGN_PROGRESS: 'sign__verify__sign_progress' = 'sign__verify__sign_progress'; +export const VERIFY_PROGRESS: 'sign__verify__verify_progress' = 'sign__verify__verify_progress'; export const CLEAR: 'sign__verify__sign__clear' = 'sign__verify__sign__clear'; \ No newline at end of file diff --git a/src/components/Textarea/index.js b/src/components/Textarea/index.js index 175e0c73..960b16c6 100644 --- a/src/components/Textarea/index.js +++ b/src/components/Textarea/index.js @@ -117,6 +117,7 @@ const getColor = (inputState) => { }; const TrezorAction = styled.div` + display: ${props => (props.action ? 'flex' : 'none')}; align-items: center; margin: 0px 10px; padding: 0 14px 0 5px; @@ -126,7 +127,7 @@ const TrezorAction = styled.div` color: ${colors.WHITE}; border-radius: 5px; line-height: 37px; - z-index: 10001; + z-index: 10002; transform: translate(-1px, -1px); `; @@ -164,6 +165,9 @@ const TextArea = ({ {topLabel} )} - {trezorAction && ( - - {trezorAction} - - )} + + {trezorAction} + {bottomText && ( { @@ -27,6 +28,7 @@ export default (state: State = initialState, action: Action): State => { }; case SIGN_VERIFY.VERIFY_PROGRESS: + console.log('action', action); return { ...state, isVerifyProgress: action.isVerifyProgress, diff --git a/src/views/Wallet/views/Account/SignVerify/index.js b/src/views/Wallet/views/Account/SignVerify/index.js index b1842276..20739685 100644 --- a/src/views/Wallet/views/Account/SignVerify/index.js +++ b/src/views/Wallet/views/Account/SignVerify/index.js @@ -116,7 +116,9 @@ class SignVerify extends Component { const { signVerifyActions, signature, + modal, } = this.props; + console.log('modal', modal); return ( Sign & Verify @@ -187,6 +189,15 @@ class SignVerify extends Component { state={(this.state.verifyAddress && validateAddress(this.state.verifyAddress)) ? 'error' : null} bottomText={this.state.verifyAddress !== '' ? validateAddress(this.state.verifyAddress) : null} isSmallText + trezorAction={this.props.isVerifyProgress ? ( + + + Check address on your Trezor + + ) : null} /> @@ -198,6 +209,15 @@ class SignVerify extends Component { rows={4} maxRows={4} maxLength="255" + trezorAction={this.props.isVerifyProgress ? ( + + + Check address on your Trezor + + ) : null} />