Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/respect custom spend limit on dapp approve modal #2556

Merged
merged 11 commits into from
May 4, 2021
Merged

Fix/respect custom spend limit on dapp approve modal #2556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fee2be7
Add better initial state reset for permission edit modal
wachunei Apr 19, 2021
002d7d6
Use spendLimitCustomValue for allowance
rickycodes Apr 20, 2021
26284a1
minimumSpendLimit 1
rickycodes Apr 20, 2021
9e72782
Remove minimumSpendLimit prop
rickycodes Apr 20, 2021
e847f29
Get minimumSpendLimit from EditPermission component
rickycodes Apr 21, 2021
c8f4392
Add MINIMUM_VALUE const
rickycodes Apr 21, 2021
39a30fe
use export const
rickycodes Apr 21, 2021
9fa4c7f
Coerce minimumSpendLimit to number
rickycodes May 3, 2021
1e6c24f
Log error
rickycodes May 3, 2021
64fd331
Remove callback from initialState
rickycodes May 4, 2021
9defc6b
Merge branch 'develop' into fix/edit-permission-initial-state
rickycodes May 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 23 additions & 13 deletions app/components/UI/ApproveTransactionReview/EditPermission/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useCallback, useMemo, useState, useEffect } from 'react';
import React, { useCallback, useMemo, useState } from 'react';
import PropTypes from 'prop-types';
import { View, StyleSheet, TouchableOpacity, TextInput } from 'react-native';
import { colors, fontStyles } from '../../../../styles/common';
Expand All @@ -9,6 +9,8 @@ import ConnectHeader from '../../ConnectHeader';
import Device from '../../../../util/Device';
import ErrorMessage from '../../../Views/SendFlow/ErrorMessage';

export const MINIMUM_VALUE = '1';

const styles = StyleSheet.create({
wrapper: {
paddingHorizontal: 24,
Expand Down Expand Up @@ -106,33 +108,41 @@ function EditPermission({
onPressSpendLimitCustomSelected,
toggleEditPermission
}) {
const [approvalSet, setApprovalSet] = useState(false);
const [initialState] = useState({ spendLimitUnlimitedSelected, spendLimitCustomValue });

const displayErrorMessage = useMemo(
() => !spendLimitUnlimitedSelected && minimumSpendLimit > spendLimitCustomValue,
() => !spendLimitUnlimitedSelected && Number(minimumSpendLimit) > spendLimitCustomValue,
[spendLimitUnlimitedSelected, spendLimitCustomValue, minimumSpendLimit]
);

const onSetApprovalAmount = useCallback(() => {
setApprovalSet(true);
if (!spendLimitUnlimitedSelected && !spendLimitCustomValue) {
onPressSpendLimitUnlimitedSelected();
} else {
setApprovalAmount();
}
}, [spendLimitUnlimitedSelected, spendLimitCustomValue, onPressSpendLimitUnlimitedSelected, setApprovalAmount]);

useEffect(
() =>
function cleanup() {
if (!spendLimitUnlimitedSelected && !approvalSet) onPressSpendLimitUnlimitedSelected();
},
[spendLimitUnlimitedSelected, approvalSet, onPressSpendLimitUnlimitedSelected]
);
const onBackPress = useCallback(() => {
const { spendLimitUnlimitedSelected, spendLimitCustomValue } = initialState;
if (spendLimitUnlimitedSelected) {
onPressSpendLimitUnlimitedSelected();
} else {
onPressSpendLimitCustomSelected();
}
onSpendLimitCustomValueChange(spendLimitCustomValue);
toggleEditPermission();
}, [
initialState,
onPressSpendLimitCustomSelected,
onPressSpendLimitUnlimitedSelected,
onSpendLimitCustomValueChange,
toggleEditPermission
]);

return (
<View style={styles.wrapper}>
<ConnectHeader action={toggleEditPermission} title={strings('spend_limit_edition.title')} />
<ConnectHeader action={onBackPress} title={strings('spend_limit_edition.title')} />
<View>
<Text style={styles.spendLimitTitle}>{strings('spend_limit_edition.spend_limit')}</Text>
<Text style={styles.spendLimitSubtitle}>
Expand Down Expand Up @@ -225,7 +235,7 @@ function EditPermission({
);
}
EditPermission.defaultProps = {
minimumSpendLimit: '1'
minimumSpendLimit: MINIMUM_VALUE
};

EditPermission.propTypes = {
Expand Down
Loading