Commit Graph

2500 Commits

Author SHA1 Message Date
Fernando 9931ef9210
Merge branch 'development' into feature/#934-advanced-settings 2020-07-03 08:07:12 -03:00
nicolas 822903c83d
sapp iframe size (#1081)
* sapp iframe size

* review changes

* CenteredMT

* remove className

Co-authored-by: Mikhail Mikheev <mmvsha73@gmail.com>
2020-07-03 14:12:49 +04:00
Mati Dastugue 0e3436bf67
Prevent showing enable data modal (#1086)
* Prevent from showing enable modal

* Add message info for failing txs

* c'mon Travis! Stop complaining.

* PR feedback improvements

Co-authored-by: Mati Dastugue <mdastugu@amazon.com>
Co-authored-by: Mikhail Mikheev <mmvsha73@gmail.com>
2020-07-03 13:59:36 +04:00
Fernando 244f81b0a4
Merge branch 'development' into feature/#934-advanced-settings 2020-07-02 20:36:51 -03:00
Mikhail Mikheev 16a7c8fb54 package.json version update to 2.5.0 2020-07-02 15:10:00 +04:00
Mikhail Mikheev 8f9e5795ba Merge branch 'master' of github.com:gnosis/safe-react into development 2020-07-02 15:09:23 +04:00
fernandomg 40cca0346f force re-build 2020-07-02 08:04:30 -03:00
Mikhail Mikheev 47aa907ca4
Merge pull request #1085 from gnosis/issue-1083
Add Idle app
2020-07-02 14:58:38 +04:00
Mikhail Mikheev 123182752c yarn.lock regenration 2020-07-02 14:47:26 +04:00
fernandomg c84caeb027 Change Advanced Settings icon
- this required to point the `@gnosis.pm/safe-react-components` to the github repo
2020-07-01 16:23:58 -03:00
fernandomg 1b9a5063f2 update `yarn.lock` 2020-07-01 13:00:36 -03:00
fernandomg bac59b9b38 remove trash code 2020-07-01 12:55:09 -03:00
fernandomg 1a095e561b fix state type in collectibles selector 2020-07-01 12:54:27 -03:00
fernandomg fe987c0bbb Fix `truffle-contract` version 2020-07-01 12:46:04 -03:00
nicosampler 725a9e9a84 sort apps alphabetically 2020-07-01 11:22:32 -03:00
nicosampler 1cdd16abb6 Add Idle sapp 2020-07-01 11:15:51 -03:00
fernandomg ea6fc17457 Rephrase remove modal message 2020-07-01 09:03:57 -03:00
fernandomg d5f6ef26f5 fix typo 2020-06-30 21:32:41 -03:00
fernandomg 873f8bad74 Enable "disable module" functionality
- changed `remoteModules` in favor of `remoteModulesPaginated`, so we can properly have track of the `prevModule` for every module
- refactored how module is stored from an array of `moduleAddress`es, to an array of `[moduleAddress, prevModuleAddress]`
- Implemented the RemoveModule by copying the `RemoveSafeModule` implementation
- TODO: display data
2020-06-30 21:30:51 -03:00
fernandomg a6ff15d1f3 Fix styles and use all the possible safe-react-components 2020-06-30 18:27:21 -03:00
fernandomg 91dc0bbc29 Migrate Settings menu to gnosis-safe-components 2020-06-30 17:10:33 -03:00
fernandomg dc75d97083 WIP: fix typings (?)
Not so sure about how robust the fix is. But allow me to continue developing
2020-06-30 15:49:47 -03:00
fernandomg ec09b3bd55 Merge branch 'development' into feature/#934-advanced-settings
# Conflicts:
#	src/routes/safe/store/actions/fetchSafe.ts
#	src/routes/safe/store/models/safe.ts
#	src/routes/safe/store/reducer/safe.ts
2020-06-30 14:23:58 -03:00
Mikhail Mikheev a8483a97da
Merge pull request #1041 from gnosis/1013-undefined-error
(Fix) - #1013 undefined error
2020-06-30 18:48:33 +04:00
nicolas d57ad72588
2.4.0 (#1079)
* Fix: Sapp confirmTXs modal width.

* explicitly type classNames

* typo

* Bump onboardjs version (#1049)

Co-authored-by: Mati Dastugue <mdastugu@amazon.com>
Co-authored-by: Mikhail Mikheev <mmvsha73@gmail.com>

* add Aave app (#1075)

* bump package.json version (#1077)

* mock commit

* yarn.lock regenration

Co-authored-by: Mikhail Mikheev <mmvsha73@gmail.com>
Co-authored-by: Mati Dastugue <matias.dastugue@altoros.com>
Co-authored-by: Mati Dastugue <mdastugu@amazon.com>
Co-authored-by: Fernando <fernando.greco@gmail.com>
2020-06-30 12:57:21 +04:00
fernandomg ebf8d149a2 WIP: code cleanup and fix typings 2020-06-29 15:46:00 -03:00
nicolas 6008eb1eb0
bump package.json version (#1077) 2020-06-29 14:08:58 -03:00
Fernando 328343fa9d
Merge pull request #1069 from gnosis/2.3.2-dev-master-backmerge 2020-06-29 13:53:57 -03:00
nicolas 6def3cbc93
add Aave app (#1075) 2020-06-29 13:39:48 -03:00
Mati Dastugue 222ace288c
Bump onboardjs version (#1049)
Co-authored-by: Mati Dastugue <mdastugu@amazon.com>
Co-authored-by: Mikhail Mikheev <mmvsha73@gmail.com>
2020-06-29 16:33:56 +04:00
Mikhail Mikheev 5c2fec4307
Merge pull request #1072 from gnosis/issue-1053
Fix: Sapp confirmTXs modal width.
2020-06-29 16:24:26 +04:00
Mikhail Mikheev ed72219f03 type definition fixes 2020-06-29 15:29:27 +04:00
fernandomg 3eba845314 WIP: add `Advanced` settings
there's a lot of duplicated code, just copying functionalities and building basic structure for the section
2020-06-26 18:57:17 -03:00
fernandomg cbc8121bd9 fix typings 2020-06-26 18:56:08 -03:00
fernandomg 2d8da9ca98 add modules 2020-06-26 18:55:48 -03:00
nicosampler 5ddb487411 typo 2020-06-26 12:29:01 -03:00
nicosampler ecf9e1dd79 explicitly type classNames 2020-06-26 12:19:29 -03:00
Mikhail Mikheev f2f9cb7d81 default safe logic fixes 2020-06-26 18:38:59 +04:00
nicosampler 7271d465e1 Fix: Sapp confirmTXs modal width. 2020-06-26 11:10:05 -03:00
Mikhail Mikheev ca51768b04 Merge branch 'development' of github.com:gnosis/safe-react into 1013-undefined-error 2020-06-26 18:09:55 +04:00
Mikhail Mikheev 92363ac4db Merge branch 'master' of github.com:gnosis/safe-react into 2.3.2-dev-master-backmerge 2020-06-26 16:36:54 +04:00
Mikhail Mikheev 941bed1423
Merge pull request #1067 from gnosis/bug/2.3.1-outgoing-transactions-not-showing
Bug: 2.3.1 Outgoing transactions not showing
2020-06-26 14:32:58 +04:00
Mikhail Mikheev 00843b5c66 Fix dev mainnet config 2020-06-26 13:36:43 +04:00
Mikhail Mikheev 728bcc3f8e fix catching errors during retrieving token symbols/decimals 2020-06-26 13:34:12 +04:00
Mikhail Mikheev 46c227881a hardcode ens contract address to isERC721Transaction function, fallback to 18/unknown in methods fetching token decimals 2020-06-26 13:22:34 +04:00
Mikhail Mikheev 51634e559d
Merge pull request #1062 from gnosis/dev-master-backmerge
Dev master backmerge
2020-06-25 17:15:48 +04:00
Mikhail Mikheev f39b0903ca
2.3.1 bugfix
* fallback to tx.recipient in case no if statement worked in getTxData

* update pkg.json
2020-06-25 16:18:53 +04:00
Fernando 1f73556d49
Merge pull request #1056 from gnosis/development 2020-06-24 11:28:43 -03:00
Fernando 86a7aebe56
Merge pull request #1055 from gnosis/fix-master_development-conflicts 2020-06-24 10:40:48 -03:00
fernandomg 6fff362664 update yarn.lock 2020-06-24 10:24:25 -03:00