Allow setting of approval amount to unlimited in edit-approval-permis…

…sion
MetaMask · Nov 4, 2019 · f12010f · f12010f
1 parent edceee2
commit f12010f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/ui/app/components/app/modals/edit-approval-permission/edit-approval-permission.component.js b/ui/app/components/app/modals/edit-approval-permission/edit-approval-permission.component.js
@@ -149,19 +149,19 @@ export default class EditApprovalPermission extends PureComponent {
 
   render () {
     const { t } = this.context
-    const { setCustomAmount, hideModal } = this.props
-
+    const { setCustomAmount, hideModal, customTokenAmount } = this.props
+    const { selectedOptionIsUnlimited, customSpendLimit } = this.state
     return (
       <Modal
         onSubmit={() => {
-          setCustomAmount(Number(this.state.customSpendLimit))
+          setCustomAmount(!selectedOptionIsUnlimited ? customSpendLimit : '')
           hideModal()
         }}
         submitText={t('save')}
         submitType="primary"
         contentClass="edit-approval-permission-modal-content"
         containerClass="edit-approval-permission-modal-container"
-        submitDisabled={ this.state.customSpendLimit === this.props.customTokenAmount }
+        submitDisabled={ (customSpendLimit === customTokenAmount) && !selectedOptionIsUnlimited }
       >
         { this.renderModalContent() }
       </Modal>