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

Sync master dev #656

Merged
merged 7 commits into from
Mar 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ before_install:
# Install truffle
- yarn global add truffle
script:
- ./config/travis/build.sh
- bash ./config/travis/build.sh
after_success:
# Pull Request - Deploy it to a review environment
# Travis doesn't do deploy step with pull requests builds
Expand Down
1 change: 0 additions & 1 deletion config/travis/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ elif [[ "$TRAVIS_BRANCH" == "development" ]]; then
export NODE_ENV=development;
fi


yarn lint:check
yarn prettier:check
yarn build
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,4 @@ const TxType = ({ origin, txType }: { txType: TransactionType, origin: string |

return <IconText iconUrl={iconUrl} text={text} />
}

export default TxType
4 changes: 3 additions & 1 deletion src/routes/safe/store/selectors/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,10 @@ export const safeSelector: OutputSelector<GlobalState, RouterProps, SafeSelector
if (!address) {
return undefined
}
const checksumed = getWeb3().utils.toChecksumAddress(address)
const safe = safes.get(checksumed)

return safes.get(address)
return safe
},
)

Expand Down
Loading