Merge branch 'development' into release/v3.2.0
This commit is contained in:
commit
c441bae7f7
|
@ -199,8 +199,8 @@ export const ChangeThresholdModal = ({
|
|||
)}
|
||||
|
||||
<Row align="center" className={classes.buttonRow}>
|
||||
<Button minWidth={140} onClick={onClose}>
|
||||
Back
|
||||
<Button minWidth={140} onClick={onClose} color="secondary">
|
||||
Cancel
|
||||
</Button>
|
||||
<Button
|
||||
color="primary"
|
||||
|
@ -209,7 +209,7 @@ export const ChangeThresholdModal = ({
|
|||
variant="contained"
|
||||
disabled={txEstimationExecutionStatus === EstimationStatus.LOADING}
|
||||
>
|
||||
Change
|
||||
Submit
|
||||
</Button>
|
||||
</Row>
|
||||
</>
|
||||
|
|
|
@ -57,7 +57,7 @@ const ThresholdSettings = (): React.ReactElement => {
|
|||
onClick={toggleModal}
|
||||
variant="contained"
|
||||
>
|
||||
Modify
|
||||
Change
|
||||
</Button>
|
||||
</Row>
|
||||
)}
|
||||
|
|
|
@ -396,8 +396,8 @@ export const ApproveTxModal = ({
|
|||
|
||||
{/* Footer */}
|
||||
<Row align="center" className={classes.buttonRow}>
|
||||
<Button minHeight={42} minWidth={140} onClick={onClose}>
|
||||
Exit
|
||||
<Button minHeight={42} minWidth={140} onClick={onClose} color="secondary">
|
||||
Close
|
||||
</Button>
|
||||
<Button
|
||||
color={isCancelTx ? 'secondary' : 'primary'}
|
||||
|
|
|
@ -103,7 +103,7 @@ export const RejectTxModal = ({ isOpen, onClose, gwTransaction }: Props): React.
|
|||
<Block className={classes.container}>
|
||||
<Row>
|
||||
<Paragraph>
|
||||
This action will cancel this transaction. A separate transaction will be performed to submit the
|
||||
This action will reject this transaction. A separate transaction will be performed to submit the
|
||||
rejection.
|
||||
</Paragraph>
|
||||
<Paragraph color="medium" size="sm">
|
||||
|
@ -134,8 +134,8 @@ export const RejectTxModal = ({ isOpen, onClose, gwTransaction }: Props): React.
|
|||
</Block>
|
||||
)}
|
||||
<Row align="center" className={classes.buttonRow}>
|
||||
<Button minHeight={42} minWidth={140} onClick={onClose}>
|
||||
Exit
|
||||
<Button minHeight={42} minWidth={140} onClick={onClose} color="secondary">
|
||||
Close
|
||||
</Button>
|
||||
<Button
|
||||
color="secondary"
|
||||
|
|
Loading…
Reference in New Issue