status-im
/
safe-react
mirror of https://github.com/status-im/safe-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'development' into release/v3.2.0

This commit is contained in:
Daniel Sanchez 2021-03-15 15:44:23 +01:00 committed by GitHub
parent 99f46043ae 2fd68c55ee
commit c441bae7f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/routes/safe/components/Settings/ThresholdSettings/ChangeThreshold/index.tsx
View File

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

2
src/routes/safe/components/Settings/ThresholdSettings/index.tsx
View File

@ -57,7 +57,7 @@ const ThresholdSettings = (): React.ReactElement => {
onClick={toggleModal}
variant="contained"
>
Modify
Change
</Button>
</Row>
)}

4
src/routes/safe/components/Transactions/TxList/modals/ApproveTxModal.tsx
View File

@ -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'}

6
src/routes/safe/components/Transactions/TxList/modals/RejectTxModal.tsx
View File

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