(Feature) Spending Limit by fernandomg · Pull Request #1351 · 5afe/safe-react

fernandomg · 2020-09-11T21:56:48Z

This PR closes #413, by:

supporting Spending Limits module as a Safe's feature
Allowing to add/edit/remove a beneficiary
Identifying and listing Spending Limit transactions in the transactions table

NOTE:
Before merging this feature, we need to remove the hardcoded address in constants.ts file and set the global variable REACT_APP_SPENDING_LIMIT_MODULE_ADDRESS to the audited module address.

How to test

"Allowances" was replaced by "Spending Limit"
Consider that feature mockups were made way before the new Safe's designs, so there will be differences.

This is an ordered list of the feature's sub-tasks.
Implementation details are in the PRs description.

task	issue	PR	important feedback
Spending Limit Settings tab	#689	#1151	#1151 (comment) #1151 (comment)
New Spending Limit	#690	#1218
Remove Spending Limit	#692	#1261
List of Spending Limit	#1039	#1261	#1261 (comment) #1261 (comment)
Send funds	#693	#1276	#1276 (comment) #1276 (comment)
Transaction list	#691	#1271	#1271 (comment)

What this feature adds to the safe:

Spending Limit as a Setting option

New Spending Limit

setup	review	listing beneficiaries

Identify Spending Limit Transactions

first ever spending limit	new beneficiary	already known beneficiary

Action 1: Enable Module Action 2: Add Beneficiary Action 3: Set the Spending Limit	Action 1: Add Beneficiary Action 2: Set the Spending Limit	Set the Spending Limit

Use the Spending Limit allowance

send	transaction details

…w-SpendingLimit

- marked `isValid` as optional, with default `true` value - marked `initialValue` as optional - migrated to hooks for material-ui styles

- migrated to hooks for material-ui styles - make `label` parametrized and optional, with default value - make `setIsValidAddress` optional

- migrated to hooks for material-ui styles

…w-SpendingLimit # Conflicts: # src/routes/safe/components/Apps/index.tsx

Also: - fixed styles - handled form state while going back and forth between create and review - had to change `Review` Button as submitting wasn't triggered on the first click.

- also refactored `ScanQRWrapper` so it uses the specified icon

…w-SpendingLimit # Conflicts: # package.json # src/routes/safe/components/Apps/index.tsx # yarn.lock

- if the module is not enabled it will be enabled on the first tx - beneficiary is added to the delegate list in the contract - allowance is set Still several things to address, like informing the user about an existing allowance, code cleanup

- create - verify existent and inform the user

…dingLimit state issue

fernandomg · 2020-10-27T23:56:53Z

Upgraded the AllowanceModule address.

Added support to deleteAllowance method.

And also, identified the Delete Spending Limit tx in the following way:

deleted spending limit

ghost · 2020-10-28T00:06:24Z

Travis automatic deployment:
https://pr1351--safereact.review.gnosisdev.com/app

ghost · 2020-10-28T00:12:59Z

Travis automatic deployment:
https://pr1351--safereact.review.gnosisdev.com/app

- this commit attempts to organize a bit the SpendingLimit code - most of the logic was moved to `src/logic/safe/utils/spendingLimits`

ghost · 2020-10-29T21:16:28Z

Travis automatic deployment:
https://pr1351--safereact.review.gnosisdev.com/rinkeby/app

ghost · 2020-10-30T23:59:29Z

Travis automatic deployment:
https://pr1351--safereact.review.gnosisdev.com/rinkeby/app

github-actions · 2020-11-02T23:07:30Z

ESLint Summary View Full Report

Annotations are provided inline on the Files Changed tab. You can also see all annotations that were generated on the annotations page.

Type	Occurrences	Fixable
Errors	0	0
Warnings	12	0
Ignored	5	N/A

Result: ✅ success
Annotations: 12 total

[warning] @typescript-eslint/explicit-module-boundary-types

Require explicit return and argument types on exported functions' and classes' public class methods

src/components/forms/SelectField/index.tsx Line 12 - Missing return type on function.
src/components/forms/SelectField/index.tsx Line 12 - Object pattern argument should be typed.
src/logic/safe/utils/upgradeSafe.ts Line 52 - Argument 'createTransaction' should be typed.
src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/OwnerForm/style.ts Line 3 - Missing return type on function.
src/routes/safe/components/Transactions/TxsTable/ExpandedTxRow/IncomingTx/index.tsx Line 7 - Missing return type on function.
src/routes/safe/components/Transactions/TxsTable/ExpandedTxRow/IncomingTx/index.tsx Line 7 - Object pattern argument should be typed.
src/routes/safe/components/Transactions/TxsTable/ExpandedTxRow/IncomingTxDescription/index.tsx Line 36 - Missing return type on function.
src/routes/safe/components/Transactions/TxsTable/ExpandedTxRow/IncomingTxDescription/index.tsx Line 36 - Object pattern argument should be typed.
src/routes/safe/components/Transactions/TxsTable/ExpandedTxRow/OutgoingTx/index.tsx Line 8 - Missing return type on function.
src/routes/safe/components/Transactions/TxsTable/ExpandedTxRow/OutgoingTx/index.tsx Line 8 - Object pattern argument should be typed.

[warning] @typescript-eslint/no-non-null-assertion

Disallows non-null assertions using the ! postfix operator

src/routes/safe/components/Transactions/TxsTable/TxType/index.tsx Line 78 - Forbidden non-null assertion.
src/routes/safe/components/Transactions/TxsTable/TxType/index.tsx Line 78 - Forbidden non-null assertion.

^{Report generated by eslint-plus-action}

ghost · 2020-11-02T23:14:35Z

Travis automatic deployment:
https://pr1351--safereact.review.gnosisdev.com/rinkeby/app

# Conflicts: # src/logic/contracts/methodIds.ts # src/logic/safe/store/actions/createTransaction.ts # src/routes/safe/components/Balances/SendModal/screens/ReviewTx/index.tsx # src/routes/safe/components/Balances/SendModal/screens/SendFunds/index.tsx

ghost · 2020-11-09T21:22:18Z

Travis automatic deployment:
https://pr1351--safereact.review.gnosisdev.com/volta/app

ghost · 2020-11-09T21:23:17Z

Travis automatic deployment:
https://pr1351--safereact.review.gnosisdev.com/rinkeby/app

ghost · 2020-11-09T21:24:30Z

Travis automatic deployment:
https://pr1351--safereact.review.gnosisdev.com/rinkeby/app

ghost · 2020-11-09T21:25:24Z

Travis automatic deployment:
https://pr1351--safereact.review.gnosisdev.com/volta/app

…on`X' before initialization` by reorganizing selectors

this is a WIP. Typings missing and some refactor around spending limit values usage.

# Conflicts: # src/logic/safe/store/models/types/transactions.d.ts # src/logic/safe/store/selectors/index.ts # src/routes/safe/components/Balances/SendModal/screens/AddressBookInput/index.tsx # src/routes/safe/components/Balances/SendModal/screens/ContractInteraction/SendCustomTx/index.tsx # src/routes/safe/components/Balances/SendModal/screens/SendFunds/index.tsx # src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/OwnerForm/index.tsx # src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/index.tsx # src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/screens/OwnerForm/index.tsx # src/routes/safe/components/Transactions/TxsTable/ExpandedTx/TxDescription/TransferDescription.tsx # src/routes/safe/components/Transactions/TxsTable/ExpandedTx/TxDescription/index.tsx # src/routes/safe/components/Transactions/TxsTable/ExpandedTx/TxDescription/utils.ts # src/routes/safe/components/Transactions/TxsTable/columns.tsx

github-actions · 2020-11-18T03:46:25Z

ESLint Summary View Full Report

Annotations are provided inline on the Files Changed tab. You can also see all annotations that were generated on the annotations page.

Type	Occurrences	Fixable
Errors	0	0
Warnings	30	0
Ignored	6	N/A

Result: ✅ success
Annotations: 30 total

[warning] @typescript-eslint/explicit-module-boundary-types

Require explicit return and argument types on exported functions' and classes' public class methods

src/components/forms/SelectField/index.tsx Line 12 - Missing return type on function.
src/components/forms/SelectField/index.tsx Line 12 - Object pattern argument should be typed.
src/logic/safe/store/middleware/notificationsMiddleware.ts Line 70 - Argument 'store' should be typed.
src/logic/safe/store/middleware/notificationsMiddleware.ts Line 70 - Argument 'next' should be typed.
src/logic/safe/store/middleware/notificationsMiddleware.ts Line 70 - Missing return type on function.
src/logic/safe/store/middleware/notificationsMiddleware.ts Line 70 - Argument 'action' should be typed.
src/logic/safe/store/middleware/safeStorage.ts Line 51 - Argument 'store' should be typed.
src/logic/safe/store/middleware/safeStorage.ts Line 51 - Argument 'next' should be typed.
src/logic/safe/store/middleware/safeStorage.ts Line 51 - Missing return type on function.
src/logic/safe/store/middleware/safeStorage.ts Line 51 - Argument 'action' should be typed.
src/logic/safe/utils/upgradeSafe.ts Line 52 - Argument 'createTransaction' should be typed.
src/logic/tokens/store/actions/activateAssetsByBalance.ts Line 6 - Argument 'safeAddress' should be typed.
src/logic/tokens/store/actions/activateAssetsByBalance.ts Line 6 - Missing return type on function.
src/logic/tokens/store/actions/activateAssetsByBalance.ts Line 6 - Argument 'dispatch' should be typed.
src/logic/tokens/store/actions/activateAssetsByBalance.ts Line 6 - Argument 'getState' should be typed.
src/routes/safe/components/Balances/SendModal/SafeInfo/index.tsx Line 7 - Missing return type on function.
src/routes/safe/components/Layout/Tabs/SettingsTab/index.tsx Line 8 - Missing return type on function.
src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/ThresholdForm/index.tsx Line 26 - Missing return type on function.
src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/ThresholdForm/index.tsx Line 26 - Object pattern argument should be typed.
src/routes/safe/components/Settings/RemoveSafeModal/index.tsx Line 32 - Missing return type on function.
src/routes/safe/components/Settings/RemoveSafeModal/index.tsx Line 32 - Object pattern argument should be typed.
src/routes/safe/components/Transactions/TxsTable/ExpandedTxRow/IncomingTx/index.tsx Line 7 - Missing return type on function.
src/routes/safe/components/Transactions/TxsTable/ExpandedTxRow/IncomingTx/index.tsx Line 7 - Object pattern argument should be typed.
src/routes/safe/components/Transactions/TxsTable/ExpandedTxRow/IncomingTxDescription/index.tsx Line 36 - Missing return type on function.
src/routes/safe/components/Transactions/TxsTable/ExpandedTxRow/IncomingTxDescription/index.tsx Line 36 - Object pattern argument should be typed.
src/routes/safe/components/Transactions/TxsTable/ExpandedTxRow/OutgoingTx/index.tsx Line 8 - Missing return type on function.
src/routes/safe/components/Transactions/TxsTable/ExpandedTxRow/OutgoingTx/index.tsx Line 8 - Object pattern argument should be typed.
src/routes/safe/container/selector.ts Line 17 - Missing return type on function.

[warning] @typescript-eslint/no-non-null-assertion

Disallows non-null assertions using the ! postfix operator

src/routes/safe/components/Transactions/TxsTable/TxType/index.tsx Line 78 - Forbidden non-null assertion.
src/routes/safe/components/Transactions/TxsTable/TxType/index.tsx Line 78 - Forbidden non-null assertion.

^{Report generated by eslint-plus-action}

fernandomg added 30 commits July 29, 2020 11:20

(Feature) [Spending Limit] Settings tab (#1151)

0277adb

Merge branch 'development' into feature/#413-SpendingLimit-in-app

d5c7e07

Merge branch 'development' into feature/#413-SpendingLimit-in-app

3b7aad9

Merge branch 'development' into feature/#413-SpendingLimit-in-app

9b3c973

fix: Card component requires className instead of styles

5e24cfc

update safe-react-components

f669a3a

change Spending Limit icon from allowances to fuelIndicator

2583e57

Merge branch 'development' into feature/#413-SpendingLimit-in-app

fdcd936

Merge branch 'feature/#413-SpendingLimit-in-app' into feature/#690-ne…

5fca120

…w-SpendingLimit

add types to TokenSelectField component

df6547a

- marked `isValid` as optional, with default `true` value - marked `initialValue` as optional - migrated to hooks for material-ui styles

refactor AddressBookInput

7616e8f

- migrated to hooks for material-ui styles - make `label` parametrized and optional, with default value - make `setIsValidAddress` optional

add types to GnoModal component

32e5d50

- migrated to hooks for material-ui styles

update safe-react-components

d0b2c7d

WIP: New Spending Limit form

cea0817

Merge branch 'development' into feature/#413-SpendingLimit-in-app

486f8a4

Merge branch 'feature/#413-SpendingLimit-in-app' into feature/#690-ne…

b603512

…w-SpendingLimit # Conflicts: # src/routes/safe/components/Apps/index.tsx

fix compatibility with new safe-react-components version

83a0478

update safe-react-components version

66c1e85

fix styles for TokenSelectField's placeholder

debf1ce

WIP: add review screen

7c109f0

Also: - fixed styles - handled form state while going back and forth between create and review - had to change `Review` Button as submitting wasn't triggered on the first click.

WIP: fix styles/layout

b854053

- also refactored `ScanQRWrapper` so it uses the specified icon

disable Spending Limit button for non-owners

3c9543d

Merge branch 'development' into feature/#413-SpendingLimit-in-app

f8a13a2

update yarn.lock

4d76fd9

Merge branch 'feature/#413-SpendingLimit-in-app' into feature/#690-ne…

ec4408e

…w-SpendingLimit # Conflicts: # package.json # src/routes/safe/components/Apps/index.tsx # yarn.lock

WIP: Add new spending limit

a3b9ee2

- if the module is not enabled it will be enabled on the first tx - beneficiary is added to the delegate list in the contract - allowance is set Still several things to address, like informing the user about an existing allowance, code cleanup

WIP: verify module is enabled and works

b5aadc8

WIP: complete New Spending Limit flow

1fea250

- create - verify existent and inform the user

WIP: properly handle tokens' decimals also fix typos and existentSpen…

4bd62a6

…dingLimit state issue

refactor: split code into components

53f9e4a

fix types

4c6bde7

Merge branch 'development' into feature/#413-SpendingLimit-in-app

c1b0e91

fernandomg added 2 commits October 29, 2020 10:46

Merge branch 'development' into feature/#413-SpendingLimit-in-app

f45e846

code reorg

b12820d

- this commit attempts to organize a bit the SpendingLimit code - most of the logic was moved to `src/logic/safe/utils/spendingLimits`

Merge branch 'development' into feature/#413-SpendingLimit-in-app

5ec3d8c

Merge branch 'development' into feature/#413-SpendingLimit-in-app

09741b6

fernandomg mentioned this pull request Nov 4, 2020

(Fix) - #1561 Outgoing instead of custom tx for sending collectibles #1567

Merged

fernandomg added 2 commits November 6, 2020 13:31

Merge branch 'development' into feature/#413-SpendingLimit-in-app

f90a35f

fernandomg removed the do-not-merge label Nov 16, 2020

fernandomg added 5 commits November 17, 2020 17:39

merge development into feature/#413-SpendingLimit-in-app

2592992

prevent runtime error `ReferenceError: can't access lexical declarati…

f6eebb1

…on`X' before initialization` by reorganizing selectors

refactor SendFunds to fix the amount field validation

4363088

this is a WIP. Typings missing and some refactor around spending limit values usage.

fixes after merge

d9901fc

fernandomg closed this Nov 20, 2020

github-actions bot locked and limited conversation to collaborators Nov 20, 2020

fernandomg deleted the feature/#413-SpendingLimit-in-app branch November 30, 2020 13:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

(Feature) Spending Limit#1351

(Feature) Spending Limit#1351
fernandomg wants to merge 185 commits intodevelopmentfrom
feature/#413-SpendingLimit-in-app

fernandomg commented Sep 11, 2020 •

edited

Loading

Uh oh!

fernandomg commented Oct 27, 2020

Uh oh!

ghost commented Oct 28, 2020

Uh oh!

ghost commented Oct 28, 2020

Uh oh!

ghost commented Oct 29, 2020

Uh oh!

ghost commented Oct 30, 2020

Uh oh!

github-actions bot commented Nov 2, 2020 •

edited

Loading

Uh oh!

ghost commented Nov 2, 2020

Uh oh!

ghost commented Nov 9, 2020

Uh oh!

ghost commented Nov 9, 2020

Uh oh!

ghost commented Nov 9, 2020

Uh oh!

ghost commented Nov 9, 2020

Uh oh!

github-actions bot commented Nov 18, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

fernandomg commented Sep 11, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

How to test

Spending Limit as a Setting option

New Spending Limit

Identify Spending Limit Transactions

Use the Spending Limit allowance

Uh oh!

fernandomg commented Oct 27, 2020

Uh oh!

ghost commented Oct 28, 2020

Uh oh!

ghost commented Oct 28, 2020

Uh oh!

ghost commented Oct 29, 2020

Uh oh!

ghost commented Oct 30, 2020

Uh oh!

github-actions bot commented Nov 2, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

ESLint Summary View Full Report

[warning] @typescript-eslint/explicit-module-boundary-types

[warning] @typescript-eslint/no-non-null-assertion

Uh oh!

ghost commented Nov 2, 2020

Uh oh!

ghost commented Nov 9, 2020

Uh oh!

ghost commented Nov 9, 2020

Uh oh!

ghost commented Nov 9, 2020

Uh oh!

ghost commented Nov 9, 2020

Uh oh!

github-actions bot commented Nov 18, 2020

ESLint Summary View Full Report

[warning] @typescript-eslint/explicit-module-boundary-types

[warning] @typescript-eslint/no-non-null-assertion

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

fernandomg commented Sep 11, 2020 •

edited

Loading

github-actions bot commented Nov 2, 2020 •

edited

Loading