Skip to content
This repository has been archived by the owner on Nov 10, 2023. It is now read-only.

Dev to master #824

Merged
merged 52 commits into from
Apr 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
94a56d2
Bug: Invalid V in signature with eth_sign (#728)
mmv08 Apr 3, 2020
727b164
BUG: Only injected providers are cached as last used provider (#733)
mmv08 Apr 3, 2020
ba49c97
(Fix) Adapt app to back-end changes (#736)
fernandomg Apr 6, 2020
0441ce2
(Fix) Transaction not automatically executed (#716)
fernandomg Apr 6, 2020
e33d9fd
(Fix) Change the order of the upgrade methods lookup (#740)
fernandomg Apr 7, 2020
b8bfeab
Feature: Use eth_sign for hardware wallets connected via onboard.js (…
mmv08 Apr 8, 2020
fbc3696
update package json (#743)
mmv08 Apr 8, 2020
fc68f70
Merge branch 'master' of github.com:gnosis/safe-react into development
mmv08 Apr 8, 2020
d2f81fc
Merge branch 'development' of github.com:gnosis/safe-react into devel…
mmv08 Apr 8, 2020
1ac13c6
(Fix) Properly decode threshold value in tx details (#749)
fernandomg Apr 9, 2020
b0849ee
fix: check for `decimals` method in transferredTokens (#748)
fernandomg Apr 9, 2020
b1f50c7
Bug #747: Don't use getLastTxNonce to fetch safe nonce (#750)
mmv08 Apr 9, 2020
4bfe937
Merge branch 'master' of github.com:gnosis/safe-react into development
mmv08 Apr 9, 2020
19dc933
Issue-595: Apps config from Manifest (#715)
nicosampler Apr 9, 2020
c40fa07
(Fix) If backend returns `null` for addresses the Transaction ca… (#718)
fernandomg Apr 13, 2020
6bdbcd2
#751 fix - Replaces decimals from backend with decimals from blockcha…
Agupane Apr 14, 2020
a18513a
Added Unilogin provider + support for legacy paths (#719)
matextrem Apr 16, 2020
dd85d4a
fallback to displaying custom tx when we fail to fetch token info (#767)
mmv08 Apr 16, 2020
4956f0e
Merge branch 'master' of github.com:gnosis/safe-react into development
mmv08 Apr 16, 2020
7da0e94
Create release.yml
matextrem Apr 16, 2020
2e5d156
Merge pull request #774 from gnosis/feature/release-script
matextrem Apr 16, 2020
204edd6
Feature #322: Set safeTxGas for newly created transactions (#752)
mmv08 Apr 20, 2020
8ba0e18
Manage Apps (#765)
nicosampler Apr 21, 2020
035882e
fix scroll and fix margin layout
alongoni Apr 22, 2020
66dc954
Add region to travis CI develop (#787)
davizalpe Apr 22, 2020
aee2a1f
Feature/travis ci s3 region (#789)
davizalpe Apr 22, 2020
c5a1e40
Merge branch 'development' into issue-773
alongoni Apr 22, 2020
124a917
fix error on Wrapper
alongoni Apr 22, 2020
38eb8ab
Add gnosis wc bridge to onboard.js wallets options array (#790)
mmv08 Apr 22, 2020
85f65f6
Merge pull request #791 from gnosis/issue-773
alongoni Apr 22, 2020
c0422bd
Rename incoming-transactions url to incoming-transfers
Uxio0 Apr 23, 2020
9d78492
Feature #587 - App performance improvement (#738)
Agupane Apr 23, 2020
162ff84
Fix (#777)
nicosampler Apr 24, 2020
0cd526f
fix: batchRequest params order
fernandomg Apr 23, 2020
edcfd2e
fix: execute decodeParams for all sendTokenTxs
fernandomg Apr 23, 2020
b46af65
fix: proper amount display for tx in TxTable
fernandomg Apr 23, 2020
d91f403
Uses formatAmount
Agupane Apr 24, 2020
75418eb
Removes unused code
Agupane Apr 23, 2020
8da025c
Fixs composeValidators
Agupane Apr 23, 2020
74d9ce7
Makes composeValidatorsApps a wrapper
Agupane Apr 24, 2020
5cbb8f5
Moves composeValidatorsApps to managesApps.js
Agupane Apr 24, 2020
c57885d
Desktop app (#745)
matextrem Apr 24, 2020
22f31b1
Merge branch 'master' of github.com:gnosis/safe-react into development
mmv08 Apr 24, 2020
281c3c6
Update yarn script + SAFE_APPS env variable
matextrem Apr 24, 2020
8c91e02
Merge pull request #808 from gnosis/fix/release-apps
matextrem Apr 24, 2020
f4cca4c
Converts custom token address to checksum version (#793)
Agupane Apr 27, 2020
76c673a
SafeTxGas calculation: Add check for openethereum/parity revert messa…
mmv08 Apr 27, 2020
5014e86
Issue 796 (#807)
nicosampler Apr 27, 2020
653f68b
(Feature) Tx Table amount notations (#812)
fernandomg Apr 27, 2020
9363485
Fix master conflicts (#819)
nicosampler Apr 27, 2020
49dc19b
Fix apps (#823)
nicosampler Apr 27, 2020
ffd9ee5
Merge branch 'development' into dev-to-master
nicosampler Apr 27, 2020
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
3 changes: 1 addition & 2 deletions src/routes/safe/components/Apps/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -300,9 +300,8 @@ function Apps({ closeModal, closeSnackbar, enqueueSnackbar, openModal }: Props)
const currentApp = list[index]

const appInfo = await getAppInfoFromUrl(currentApp.url)

if (appInfo.error) {
throw Error()
throw Error(`There was a problem trying to load app ${currentApp.url}`)
}

appInfo.disabled = currentApp.disabled === undefined ? false : currentApp.disabled
Expand Down
3 changes: 2 additions & 1 deletion src/routes/safe/components/Apps/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const getAppInfoFromOrigin = (origin: string) => {
}

export const getAppInfoFromUrl = async (appUrl: string) => {
let res = { id: undefined, url: cleanedUpAppUrl, name: 'unknown', iconUrl: appsIconSvg, error: true }
let res = { id: undefined, url: appUrl, name: 'unknown', iconUrl: appsIconSvg, error: true }

if (!appUrl) {
return res
Expand All @@ -29,6 +29,7 @@ export const getAppInfoFromUrl = async (appUrl: string) => {
let cleanedUpAppUrl = appUrl.trim()
if (cleanedUpAppUrl.substr(-1) === '/') {
cleanedUpAppUrl = cleanedUpAppUrl.substr(0, cleanedUpAppUrl.length - 1)
res.url = cleanedUpAppUrl
}

try {
Expand Down