diff --git a/src/components-v2/layouts/ListContentLayout/List.jsx b/src/components-v2/layouts/ListContentLayout/List.jsx index 2ae96666..42a8f93f 100644 --- a/src/components-v2/layouts/ListContentLayout/List.jsx +++ b/src/components-v2/layouts/ListContentLayout/List.jsx @@ -37,7 +37,7 @@ type Props = { const List = ({ activeItem, classes, items, onItemClick }: Props) => { return ( - {items.map(i => ( + {items.map((i) => ( { disabled label="Necessary" name="Necessary" - onChange={() => setLocalNecessary(prev => !prev)} + onChange={() => setLocalNecessary((prev) => !prev)} value={localNecessary} /> @@ -169,7 +169,7 @@ const CookiesBanner = () => { control={} label="Analytics" name="Analytics" - onChange={() => setLocalAnalytics(prev => !prev)} + onChange={() => setLocalAnalytics((prev) => !prev)} value={localAnalytics} /> diff --git a/src/components/Header/components/Layout.jsx b/src/components/Header/components/Layout.jsx index 9d0a5aaa..0fea8a87 100644 --- a/src/components/Header/components/Layout.jsx +++ b/src/components/Header/components/Layout.jsx @@ -77,7 +77,7 @@ const Layout = openHoc(({ classes, clickAway, open, providerDetails, providerInf - {providerRef => ( + {(providerRef) => ( { export default connect( // $FlowFixMe - state => ({ safesCount: safesCountSelector(state) }), + (state) => ({ safesCount: safesCountSelector(state) }), null, )(SafeListHeader) diff --git a/src/components/Identicon/blockies.js b/src/components/Identicon/blockies.js index 538b828d..bebdfb9b 100644 --- a/src/components/Identicon/blockies.js +++ b/src/components/Identicon/blockies.js @@ -1,11 +1,11 @@ /* eslint-disable */ -;(function(global, factory) { +;(function (global, factory) { typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) : typeof define === 'function' && define.amd ? define(['exports'], factory) : factory((global.blockies = {})) -})(this, function(exports) { +})(this, function (exports) { 'use strict' /** @@ -40,7 +40,7 @@ return String.fromCharCode(w & 255, (w >> 8) & 255) } - var PNG = function(width, height, depth) { + var PNG = function (width, height, depth) { this.width = width this.height = height this.depth = depth @@ -115,14 +115,14 @@ } // compute the index into a png for a given pixel - this.index = function(x, y) { + this.index = function (x, y) { var i = y * (this.width + 1) + x + 1 var j = this.idat_offs + 8 + 2 + 5 * Math.floor(i / 0xffff + 1) + i return j } // convert a color and build up the palette - this.color = function(red, green, blue, alpha) { + this.color = function (red, green, blue, alpha) { alpha = alpha >= 0 ? alpha : 255 var color = (((((alpha << 8) | red) << 8) | green) << 8) | blue @@ -142,7 +142,7 @@ } // output a PNG string, Base64 encoded - this.getBase64 = function() { + this.getBase64 = function () { var s = this.getDump() var ch = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=' @@ -173,7 +173,7 @@ } // output a PNG string - this.getDump = function() { + this.getDump = function () { // compute adler32 of output pixels + row filter bytes var BASE = 65521 /* largest prime smaller than 65536 */ var NMAX = 5552 /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */ @@ -215,7 +215,7 @@ return '\x89PNG\r\n\x1A\n' + this.buffer.join('') } - this.fillRect = function(x, y, w, h, color) { + this.fillRect = function (x, y, w, h, color) { for (var i = 0; i < w; i++) { for (var j = 0; j < h; j++) { this.buffer[this.index(x + i, y + j)] = color diff --git a/src/components/Notifier/index.js b/src/components/Notifier/index.js index 8982b3ca..46a51d24 100644 --- a/src/components/Notifier/index.js +++ b/src/components/Notifier/index.js @@ -45,7 +45,7 @@ class Notifier extends Component { componentDidUpdate() { const { notifications = [], enqueueSnackbar, removeSnackbar } = this.props - notifications.forEach(notification => { + notifications.forEach((notification) => { // Do nothing if snackbar is already displayed if (this.displayed.includes(notification.key)) { return @@ -68,7 +68,7 @@ class Notifier extends Component { }) } - storeDisplayed = id => { + storeDisplayed = (id) => { this.displayed = [...this.displayed, id] } diff --git a/src/components/ScanQRModal/index.jsx b/src/components/ScanQRModal/index.jsx index c5a95c0b..ff4af1f1 100644 --- a/src/components/ScanQRModal/index.jsx +++ b/src/components/ScanQRModal/index.jsx @@ -72,10 +72,10 @@ const ScanQRModal = ({ classes, isOpen, onClose, onScan }: Props) => { ) : ( { + onError={(err) => { console.error(err) }} - onScan={data => { + onScan={(data) => { if (data) onScan(data) }} ref={scannerRef} diff --git a/src/components/Sidebar/SafeList/index.jsx b/src/components/Sidebar/SafeList/index.jsx index 933dba50..9d83bd85 100644 --- a/src/components/Sidebar/SafeList/index.jsx +++ b/src/components/Sidebar/SafeList/index.jsx @@ -79,7 +79,7 @@ const SafeList = ({ currentSafe, defaultSafe, onSafeClick, safes, setDefaultSafe return ( - {safes.map(safe => ( + {safes.map((safe) => ( { + onClick={(e) => { e.preventDefault() e.stopPropagation() diff --git a/src/components/Sidebar/index.jsx b/src/components/Sidebar/index.jsx index c9eb972a..13c86f93 100644 --- a/src/components/Sidebar/index.jsx +++ b/src/components/Sidebar/index.jsx @@ -69,7 +69,7 @@ const Sidebar = ({ children, currentSafe, defaultSafe, safes, setDefaultSafeActi } const toggleSidebar = () => { - setIsOpen(prevIsOpen => !prevIsOpen) + setIsOpen((prevIsOpen) => !prevIsOpen) } const handleFilterChange = (value: string) => { @@ -142,7 +142,7 @@ const Sidebar = ({ children, currentSafe, defaultSafe, safes, setDefaultSafeActi export default connect( // $FlowFixMe - state => ({ + (state) => ({ safes: sortedSafeListSelector(state), defaultSafe: defaultSafeSelector(state), currentSafe: safeParamAddressFromStateSelector(state), diff --git a/src/components/Stepper/index.jsx b/src/components/Stepper/index.jsx index d2777316..e2cfce2a 100644 --- a/src/components/Stepper/index.jsx +++ b/src/components/Stepper/index.jsx @@ -54,7 +54,7 @@ const GnoStepper = (props: Props) => { const getPageProps = (pages: React.Node): PageProps => React.Children.toArray(pages)[page].props - const updateInitialProps = newInitialProps => { + const updateInitialProps = (newInitialProps) => { setValues(newInitialProps) } @@ -107,7 +107,7 @@ const GnoStepper = (props: Props) => { return next(formValues) } - const isLastPage = pageNumber => { + const isLastPage = (pageNumber) => { const { steps } = props return pageNumber === steps.length - 1 } diff --git a/src/components/Table/sorting.js b/src/components/Table/sorting.js index 9b983c8f..6d68b8f7 100644 --- a/src/components/Table/sorting.js +++ b/src/components/Table/sorting.js @@ -39,7 +39,7 @@ export const stableSort = (dataArray: List, cmp: any, fixed: boolean): List return a[1] - b[1] }) - const sortedElems: List = stabilizedThis.map(el => el[0]) + const sortedElems: List = stabilizedThis.map((el) => el[0]) return fixedElems.concat(sortedElems) } diff --git a/src/components/forms/AddressInput/index.jsx b/src/components/forms/AddressInput/index.jsx index 8e107fff..e371de9a 100644 --- a/src/components/forms/AddressInput/index.jsx +++ b/src/components/forms/AddressInput/index.jsx @@ -20,7 +20,7 @@ type Props = { disabled?: boolean, } -const isValidEnsName = name => /^([\w-]+\.)+(eth|test|xyz|luxe)$/.test(name) +const isValidEnsName = (name) => /^([\w-]+\.)+(eth|test|xyz|luxe)$/.test(name) // an idea for second field was taken from here // https://github.com/final-form/react-final-form-listeners/blob/master/src/OnBlur.js @@ -52,7 +52,7 @@ const AddressInput = ({ validate={composeValidators(required, mustBeEthereumAddress, ...validators)} /> - {async value => { + {async (value) => { if (isValidEnsName(value)) { try { const resolverAddr = await getAddressFromENS(value) diff --git a/src/components/layout/PageFrame/index.jsx b/src/components/layout/PageFrame/index.jsx index 0abd1c11..73119389 100644 --- a/src/components/layout/PageFrame/index.jsx +++ b/src/components/layout/PageFrame/index.jsx @@ -80,7 +80,7 @@ const PageFrame = ({ children, classes, currentNetwork }: Props) => { export default withStyles(notificationStyles)( connect( - state => ({ + (state) => ({ currentNetwork: networkSelector(state), }), null, diff --git a/src/logic/addressBook/store/actions/loadAddressBookFromStorage.js b/src/logic/addressBook/store/actions/loadAddressBookFromStorage.js index 013dd33f..8ed33370 100644 --- a/src/logic/addressBook/store/actions/loadAddressBookFromStorage.js +++ b/src/logic/addressBook/store/actions/loadAddressBookFromStorage.js @@ -19,7 +19,7 @@ const loadAddressBookFromStorage = () => async (dispatch: ReduxDispatch { + safes.forEach((safe) => { const { address } = safe const found = adbkEntries.includes(address) if (!found) { diff --git a/src/logic/addressBook/store/reducer/addressBook.js b/src/logic/addressBook/store/reducer/addressBook.js index 23a5d68f..93f4ebf7 100644 --- a/src/logic/addressBook/store/reducer/addressBook.js +++ b/src/logic/addressBook/store/reducer/addressBook.js @@ -47,11 +47,11 @@ export default handleActions( const { entry } = action.payload // Adds the entry to all the safes (if it does not already exists) - const newState = state.withMutations(map => { + const newState = state.withMutations((map) => { const adbkMap = map.get('addressBook') if (adbkMap) { - adbkMap.keySeq().forEach(safeAddress => { + adbkMap.keySeq().forEach((safeAddress) => { const safeAddressBook = state.getIn(['addressBook', safeAddress]) if (safeAddressBook) { @@ -71,13 +71,13 @@ export default handleActions( const { entry } = action.payload // Updates the entry from all the safes - const newState = state.withMutations(map => { + const newState = state.withMutations((map) => { map .get('addressBook') .keySeq() - .forEach(safeAddress => { + .forEach((safeAddress) => { const entriesList: List = state.getIn(['addressBook', safeAddress]) - const entryIndex = entriesList.findIndex(entryItem => sameAddress(entryItem.address, entry.address)) + const entryIndex = entriesList.findIndex((entryItem) => sameAddress(entryItem.address, entry.address)) const updatedEntriesList = entriesList.set(entryIndex, entry) map.setIn(['addressBook', safeAddress], updatedEntriesList) }) @@ -88,13 +88,13 @@ export default handleActions( [REMOVE_ENTRY]: (state: State, action: ActionType): State => { const { entryAddress } = action.payload // Removes the entry from all the safes - const newState = state.withMutations(map => { + const newState = state.withMutations((map) => { map .get('addressBook') .keySeq() - .forEach(safeAddress => { + .forEach((safeAddress) => { const entriesList = state.getIn(['addressBook', safeAddress]) - const entryIndex = entriesList.findIndex(entry => sameAddress(entry.address, entryAddress)) + const entryIndex = entriesList.findIndex((entry) => sameAddress(entry.address, entryAddress)) const updatedEntriesList = entriesList.remove(entryIndex) map.setIn(['addressBook', safeAddress], updatedEntriesList) }) @@ -105,15 +105,15 @@ export default handleActions( const { entry, entryAddress } = action.payload // Adds or Updates the entry to all the safes - return state.withMutations(map => { + return state.withMutations((map) => { const addressBook = map.get('addressBook') if (addressBook) { - addressBook.keySeq().forEach(safeAddress => { + addressBook.keySeq().forEach((safeAddress) => { const safeAddressBook: List = state.getIn(['addressBook', safeAddress]) - const entryIndex = safeAddressBook.findIndex(entryItem => sameAddress(entryItem.address, entryAddress)) + const entryIndex = safeAddressBook.findIndex((entryItem) => sameAddress(entryItem.address, entryAddress)) if (entryIndex !== -1) { - const updatedEntriesList = safeAddressBook.update(entryIndex, currentEntry => currentEntry.merge(entry)) + const updatedEntriesList = safeAddressBook.update(entryIndex, (currentEntry) => currentEntry.merge(entry)) map.setIn(['addressBook', safeAddress], updatedEntriesList) } else { const updatedSafeAdbkList = safeAddressBook.push(makeAddressBookEntry(entry)) diff --git a/src/logic/addressBook/store/selectors/index.js b/src/logic/addressBook/store/selectors/index.js index 259185db..edef7837 100644 --- a/src/logic/addressBook/store/selectors/index.js +++ b/src/logic/addressBook/store/selectors/index.js @@ -41,7 +41,7 @@ export const getNameFromAddressBook = (userAddress: string): string | null => { return null } const addressBook = useSelector(getAddressBook) - const result = addressBook.filter(addressBookItem => addressBookItem.address === userAddress) + const result = addressBook.filter((addressBookItem) => addressBookItem.address === userAddress) if (result.size > 0) { return result.get(0).name } diff --git a/src/logic/addressBook/utils/index.js b/src/logic/addressBook/utils/index.js index dd545fc7..52d98617 100644 --- a/src/logic/addressBook/utils/index.js +++ b/src/logic/addressBook/utils/index.js @@ -23,10 +23,10 @@ export const saveAddressBook = async (addressBook: AddressBook) => { } export const getAddressesListFromAdbk = (addressBook: AddressBook) => - Array.from(addressBook).map(entry => entry.address) + Array.from(addressBook).map((entry) => entry.address) const getNameFromAdbk = (addressBook: AddressBook, userAddress: string): string | null => { - const entry = addressBook.find(addressBookItem => addressBookItem.address === userAddress) + const entry = addressBook.find((addressBookItem) => addressBookItem.address === userAddress) if (entry) { return entry.name } @@ -45,7 +45,7 @@ export const getOwnersWithNameFromAddressBook = (addressBook: AddressBook, owner if (!ownerList) { return [] } - const ownersListWithAdbkNames = ownerList.map(owner => { + const ownersListWithAdbkNames = ownerList.map((owner) => { const ownerName = getNameFromAdbk(addressBook, owner.address) return { address: owner.address, diff --git a/src/logic/currencyValues/store/actions/fetchCurrencyValues.js b/src/logic/currencyValues/store/actions/fetchCurrencyValues.js index 9be3bc7c..8ad14f95 100644 --- a/src/logic/currencyValues/store/actions/fetchCurrencyValues.js +++ b/src/logic/currencyValues/store/actions/fetchCurrencyValues.js @@ -18,8 +18,8 @@ export const fetchCurrencyValues = (safeAddress: string) => async (dispatch: Red // eslint-disable-next-line max-len const currencyList = List( tokensFetched.data - .filter(currencyBalance => currencyBalance.balanceUsd) - .map(currencyBalance => { + .filter((currencyBalance) => currencyBalance.balanceUsd) + .map((currencyBalance) => { const { balanceUsd, tokenAddress } = currencyBalance return makeBalanceCurrency({ currencyName: balanceUsd ? AVAILABLE_CURRENCIES.USD : null, diff --git a/src/logic/currentSession/store/reducer/currentSession.js b/src/logic/currentSession/store/reducer/currentSession.js index 292d4b7c..d8b427ea 100644 --- a/src/logic/currentSession/store/reducer/currentSession.js +++ b/src/logic/currentSession/store/reducer/currentSession.js @@ -16,7 +16,7 @@ export default handleActions( [UPDATE_VIEWED_SAFES]: (state: State, action: ActionType): State => { const safeAddress = action.payload - const newState = state.updateIn(['viewedSafes'], prev => + const newState = state.updateIn(['viewedSafes'], (prev) => prev.includes(safeAddress) ? prev : [...prev, safeAddress], ) diff --git a/src/logic/notifications/notificationBuilder.js b/src/logic/notifications/notificationBuilder.js index 80008d7b..af5b4549 100644 --- a/src/logic/notifications/notificationBuilder.js +++ b/src/logic/notifications/notificationBuilder.js @@ -231,7 +231,7 @@ export const showSnackbar = (notification: Notification, enqueueSnackbar: Functi enqueueSnackbar(notification.message, { ...notification.options, // eslint-disable-next-line react/display-name - action: key => ( + action: (key) => ( closeSnackbar(key)}> diff --git a/src/logic/notifications/store/reducer/notifications.js b/src/logic/notifications/store/reducer/notifications.js index c588dfc8..cc955d14 100644 --- a/src/logic/notifications/store/reducer/notifications.js +++ b/src/logic/notifications/store/reducer/notifications.js @@ -23,10 +23,10 @@ export default handleActions( const { dismissAll, key } = action.payload if (key) { - return state.update(key, prev => prev.set('dismissed', true)) + return state.update(key, (prev) => prev.set('dismissed', true)) } if (dismissAll) { - return state.withMutations(map => { + return state.withMutations((map) => { map.forEach((notification, notificationKey) => { map.set(notificationKey, notification.set('dismissed', true)) }) diff --git a/src/logic/safe/safeTxSigner.js b/src/logic/safe/safeTxSigner.js index cfa5716a..fc46af26 100644 --- a/src/logic/safe/safeTxSigner.js +++ b/src/logic/safe/safeTxSigner.js @@ -23,7 +23,7 @@ export const generateSignaturesFromTxConfirmations = ( let sigs = '0x' Object.keys(confirmationsMap) .sort() - .forEach(addr => { + .forEach((addr) => { const conf = confirmationsMap[addr] if (conf.signature) { sigs += conf.signature.slice(2) diff --git a/src/logic/safe/transactions/awaitingTransactions.js b/src/logic/safe/transactions/awaitingTransactions.js index 4ac01144..eff19746 100644 --- a/src/logic/safe/transactions/awaitingTransactions.js +++ b/src/logic/safe/transactions/awaitingTransactions.js @@ -12,7 +12,7 @@ export const getAwaitingTransactions = ( return Map({}) } - const allAwaitingTransactions = allTransactions.map(safeTransactions => { + const allAwaitingTransactions = allTransactions.map((safeTransactions) => { const nonCancelledTransactions = safeTransactions.filter((transaction: Transaction) => { // If transactions are not executed, but there's a transaction with the same nonce EXECUTED later // it means that the transaction was cancelled (Replaced) and shouldn't get executed @@ -27,7 +27,7 @@ export const getAwaitingTransactions = ( // Then we check if the waiting confirmations are not from the current user, otherwise, filters this // transaction const transactionWaitingUser = transaction.confirmations.filter( - confirmation => confirmation.owner && confirmation.owner.address !== userAccount, + (confirmation) => confirmation.owner && confirmation.owner.address !== userAccount, ) return transactionWaitingUser.size > 0 diff --git a/src/logic/safe/transactions/gas.js b/src/logic/safe/transactions/gas.js index c8072f37..15d3aca4 100644 --- a/src/logic/safe/transactions/gas.js +++ b/src/logic/safe/transactions/gas.js @@ -5,7 +5,7 @@ import { getGnosisSafeInstanceAt } from '~/logic/contracts/safeContracts' import { EMPTY_DATA } from '~/logic/wallets/ethTransactions' import { getWeb3 } from '~/logic/wallets/getWeb3' -const estimateDataGasCosts = data => { +const estimateDataGasCosts = (data) => { const reducer = (accumulator, currentValue) => { if (currentValue === EMPTY_DATA) { return accumulator + 0 diff --git a/src/logic/safe/transactions/offchainSigner/ethSigner.js b/src/logic/safe/transactions/offchainSigner/ethSigner.js index ae4c45ea..42a772cb 100644 --- a/src/logic/safe/transactions/offchainSigner/ethSigner.js +++ b/src/logic/safe/transactions/offchainSigner/ethSigner.js @@ -2,9 +2,9 @@ import { EMPTY_DATA } from '~/logic/wallets/ethTransactions' import { getWeb3 } from '~/logic/wallets/getWeb3' -const ETH_SIGN_NOT_SUPPORTED_ERROR_MSG = 'ETH_SIGN_NOT_SUPPORTED_ERROR_MSG' +const ETH_SIGN_NOT_SUPPORTED_ERROR_MSG = 'ETH_SIGN_NOT_SUPPORTED' -export const generateEthSignature = async ({ +export const getEthSigner = async ({ baseGas, data, gasPrice, diff --git a/src/logic/safe/transactions/offchainSigner/index.js b/src/logic/safe/transactions/offchainSigner/index.js index 9b855805..2e360d5f 100644 --- a/src/logic/safe/transactions/offchainSigner/index.js +++ b/src/logic/safe/transactions/offchainSigner/index.js @@ -1,13 +1,13 @@ // @flow -// import { getEIP712Signer } from './EIP712Signer' -import { generateEthSignature } from './ethSigner' +import { getEIP712Signer } from './EIP712Signer' +import { getEthSigner } from './ethSigner' // 1. we try to sign via EIP-712 if user's wallet supports it // 2. If not, try to use eth_sign (Safe version has to be >1.1.1) // If eth_sign, doesn't work continue with the regular flow (on-chain signatures, more in createTransaction.js) -const signingFuncs = [generateEthSignature] +const signingFuncs = [getEIP712Signer('v3'), getEIP712Signer('v4'), getEIP712Signer(), getEthSigner] export const SAFE_VERSION_FOR_OFFCHAIN_SIGNATURES = '>=1.1.1' diff --git a/src/logic/safe/utils/safeVersion.js b/src/logic/safe/utils/safeVersion.js index 6da4365a..423ea4c7 100644 --- a/src/logic/safe/utils/safeVersion.js +++ b/src/logic/safe/utils/safeVersion.js @@ -22,7 +22,7 @@ export const safeNeedsUpdate = (currentVersion: string, latestVersion: string) = return latest ? semverLessThan(current, latest) : false } -export const getCurrentSafeVersion = gnosisSafeInstance => gnosisSafeInstance.VERSION() +export const getCurrentSafeVersion = (gnosisSafeInstance) => gnosisSafeInstance.VERSION() export const enabledFeatures = (version: string) => FEATURES.reduce((acc, feature) => { diff --git a/src/logic/tokens/store/actions/activateTokensByBalance.js b/src/logic/tokens/store/actions/activateTokensByBalance.js index 5db61c81..da377195 100644 --- a/src/logic/tokens/store/actions/activateTokensByBalance.js +++ b/src/logic/tokens/store/actions/activateTokensByBalance.js @@ -44,7 +44,7 @@ const activateTokensByBalance = (safeAddress: string) => async ( ) // active tokens by balance, excluding those already blacklisted and the `null` address - const activeByBalance = addresses.filter(address => address !== null && !blacklistedTokens.includes(address)) + const activeByBalance = addresses.filter((address) => address !== null && !blacklistedTokens.includes(address)) // need to persist those already active tokens, despite its balances const activeTokens = alreadyActiveTokens.toSet().union(activeByBalance) diff --git a/src/logic/tokens/store/reducer/tokens.js b/src/logic/tokens/store/reducer/tokens.js index 2454dcc6..3d9d1916 100644 --- a/src/logic/tokens/store/reducer/tokens.js +++ b/src/logic/tokens/store/reducer/tokens.js @@ -16,8 +16,8 @@ export default handleActions( [ADD_TOKENS]: (state: State, action: ActionType): State => { const { tokens } = action.payload - const newState = state.withMutations(map => { - tokens.forEach(token => { + const newState = state.withMutations((map) => { + tokens.forEach((token) => { map.set(token.address, token) }) }) diff --git a/src/logic/tokens/utils/tokensStorage.js b/src/logic/tokens/utils/tokensStorage.js index c1aea74a..bf89f9f1 100644 --- a/src/logic/tokens/utils/tokensStorage.js +++ b/src/logic/tokens/utils/tokensStorage.js @@ -44,7 +44,7 @@ export const removeTokenFromStorage = async (safeAddress: string, token: Token) export const removeFromActiveTokens = async (safeAddress: string, token: Token) => { const activeTokens = await getActiveTokens() - const index = activeTokens.findIndex(activeToken => activeToken.name === token.name) + const index = activeTokens.findIndex((activeToken) => activeToken.name === token.name) if (index !== -1) { await saveActiveTokens(safeAddress, activeTokens.delete(index)) diff --git a/src/logic/wallets/ethAddresses.js b/src/logic/wallets/ethAddresses.js index 7b831c53..a5a0e2e2 100644 --- a/src/logic/wallets/ethAddresses.js +++ b/src/logic/wallets/ethAddresses.js @@ -49,4 +49,4 @@ export const isUserOwner = (safe: Safe, userAccount: string): boolean => { } export const isUserOwnerOnAnySafe = (safes: List, userAccount: string): boolean => - safes.some(safe => isUserOwner(safe, userAccount)) + safes.some((safe) => isUserOwner(safe, userAccount)) diff --git a/src/logic/wallets/transactionDataCheck.js b/src/logic/wallets/transactionDataCheck.js index 58767c4d..c19df493 100644 --- a/src/logic/wallets/transactionDataCheck.js +++ b/src/logic/wallets/transactionDataCheck.js @@ -1,7 +1,7 @@ // @flow function transactionDataCheck() { let completed = false - return stateAndHelpers => { + return (stateAndHelpers) => { const { wallet } = stateAndHelpers if (wallet && wallet.name === 'Ledger' && !completed) { diff --git a/src/routes/load/components/DetailsForm/index.jsx b/src/routes/load/components/DetailsForm/index.jsx index 0ee98409..1d005ca8 100644 --- a/src/routes/load/components/DetailsForm/index.jsx +++ b/src/routes/load/components/DetailsForm/index.jsx @@ -104,7 +104,7 @@ const Details = ({ classes, errors, form }: Props) => ( { + fieldMutator={(val) => { form.mutators.setValue(FIELD_LOAD_ADDRESS, val) }} inputAdornment={ diff --git a/src/routes/open/components/SafeOwnersConfirmationsForm/index.jsx b/src/routes/open/components/SafeOwnersConfirmationsForm/index.jsx index a6f374aa..f4035f41 100644 --- a/src/routes/open/components/SafeOwnersConfirmationsForm/index.jsx +++ b/src/routes/open/components/SafeOwnersConfirmationsForm/index.jsx @@ -74,7 +74,7 @@ const SafeOwners = (props: Props) => { const [qrModalOpen, setQrModalOpen] = useState(false) const [scanQrForOwnerName, setScanQrForOwnerName] = useState(null) - const openQrModal = ownerName => { + const openQrModal = (ownerName) => { setScanQrForOwnerName(ownerName) setQrModalOpen(true) } @@ -94,7 +94,7 @@ const SafeOwners = (props: Props) => { setNumOwners(numOwners + 1) } - const handleScan = value => { + const handleScan = (value) => { let scannedAddress = value if (scannedAddress.startsWith('ethereum:')) { @@ -144,7 +144,7 @@ const SafeOwners = (props: Props) => { { + fieldMutator={(val) => { form.mutators.setValue(addressName, val) }} inputAdornment={ diff --git a/src/routes/open/components/fields.js b/src/routes/open/components/fields.js index ab5f65ae..679a7853 100644 --- a/src/routes/open/components/fields.js +++ b/src/routes/open/components/fields.js @@ -10,7 +10,7 @@ export const getOwnerAddressBy = (index: number) => `owner${index}Address` export const getNumOwnersFrom = (values: Object) => { const accounts = Object.keys(values) .sort() - .filter(key => /^owner\d+Address$/.test(key) && !!values[key]) + .filter((key) => /^owner\d+Address$/.test(key) && !!values[key]) return accounts.length } diff --git a/src/routes/open/utils/safeDataExtractor.js b/src/routes/open/utils/safeDataExtractor.js index e37d41f4..615206bd 100644 --- a/src/routes/open/utils/safeDataExtractor.js +++ b/src/routes/open/utils/safeDataExtractor.js @@ -6,17 +6,17 @@ import { type Owner, makeOwner } from '~/routes/safe/store/models/owner' export const getAccountsFrom = (values: Object): string[] => { const accounts = Object.keys(values) .sort() - .filter(key => /^owner\d+Address$/.test(key)) + .filter((key) => /^owner\d+Address$/.test(key)) - return accounts.map(account => values[account]).slice(0, values.owners) + return accounts.map((account) => values[account]).slice(0, values.owners) } export const getNamesFrom = (values: Object): string[] => { const accounts = Object.keys(values) .sort() - .filter(key => /^owner\d+Name$/.test(key)) + .filter((key) => /^owner\d+Name$/.test(key)) - return accounts.map(account => values[account]).slice(0, values.owners) + return accounts.map((account) => values[account]).slice(0, values.owners) } export const getOwnersFrom = (names: string[], addresses: string[]): List => { diff --git a/src/routes/safe/components/AddressBook/CreateEditEntryModal/index.jsx b/src/routes/safe/components/AddressBook/CreateEditEntryModal/index.jsx index 05026e09..d43bf19f 100644 --- a/src/routes/safe/components/AddressBook/CreateEditEntryModal/index.jsx +++ b/src/routes/safe/components/AddressBook/CreateEditEntryModal/index.jsx @@ -43,7 +43,7 @@ const CreateEditEntryModalComponent = ({ newEntryModalHandler, onClose, }: Props) => { - const onFormSubmitted = values => { + const onFormSubmitted = (values) => { if (entryToEdit && !entryToEdit.entry.isNew) { editEntryModalHandler(values) } else { diff --git a/src/routes/safe/components/AddressBook/DeleteEntryModal/index.jsx b/src/routes/safe/components/AddressBook/DeleteEntryModal/index.jsx index ea1d4eaf..c99e65cd 100644 --- a/src/routes/safe/components/AddressBook/DeleteEntryModal/index.jsx +++ b/src/routes/safe/components/AddressBook/DeleteEntryModal/index.jsx @@ -26,7 +26,7 @@ type Props = { } const DeleteEntryModalComponent = ({ classes, deleteEntryModalHandler, entryToDelete, isOpen, onClose }: Props) => { - const handleDeleteEntrySubmit = values => { + const handleDeleteEntrySubmit = (values) => { deleteEntryModalHandler(values, entryToDelete.index) } diff --git a/src/routes/safe/components/AddressBook/EllipsisTransactionDetails/index.jsx b/src/routes/safe/components/AddressBook/EllipsisTransactionDetails/index.jsx index 7a928d73..62cf8ff8 100644 --- a/src/routes/safe/components/AddressBook/EllipsisTransactionDetails/index.jsx +++ b/src/routes/safe/components/AddressBook/EllipsisTransactionDetails/index.jsx @@ -43,7 +43,7 @@ const EllipsisTransactionDetails = ({ address, knownAddress }: EllipsisTransacti const dispatch = useDispatch() const currentSafeAddress = useSelector(safeParamAddressFromStateSelector) - const handleClick = event => { + const handleClick = (event) => { setAnchorEl(event.currentTarget) } diff --git a/src/routes/safe/components/AddressBook/index.jsx b/src/routes/safe/components/AddressBook/index.jsx index 87992c0a..10ebc8f7 100644 --- a/src/routes/safe/components/AddressBook/index.jsx +++ b/src/routes/safe/components/AddressBook/index.jsx @@ -51,7 +51,7 @@ type Props = { const AddressBookTable = ({ classes }: Props) => { const columns = generateColumns() - const autoColumns = columns.filter(c => !c.custom) + const autoColumns = columns.filter((c) => !c.custom) const dispatch = useDispatch() const addressBook = useSelector(getAddressBookListSelector) const [selectedEntry, setSelectedEntry] = useState(null) @@ -68,7 +68,7 @@ const AddressBookTable = ({ classes }: Props) => { useEffect(() => { if (entryAddressToEditOrCreateNew) { - const key = addressBook.findKey(entry => entry.address === entryAddressToEditOrCreateNew) + const key = addressBook.findKey((entry) => entry.address === entryAddressToEditOrCreateNew) if (key >= 0) { // Edit old entry const value = addressBook.get(key) diff --git a/src/routes/safe/components/Apps/appsList.js b/src/routes/safe/components/Apps/appsList.js index b69b9ccc..0278c4f8 100644 --- a/src/routes/safe/components/Apps/appsList.js +++ b/src/routes/safe/components/Apps/appsList.js @@ -48,7 +48,7 @@ const appList = [ export default appList export const getAppInfo = (appId: string) => { - const res = appList.find(app => app.id === appId.toString()) + const res = appList.find((app) => app.id === appId.toString()) if (!res) { return { id: 0, diff --git a/src/routes/safe/components/Apps/index.jsx b/src/routes/safe/components/Apps/index.jsx index fc64d228..4960f462 100644 --- a/src/routes/safe/components/Apps/index.jsx +++ b/src/routes/safe/components/Apps/index.jsx @@ -13,7 +13,7 @@ import ButtonLink from '~/components/layout/ButtonLink' const StyledIframe = styled.iframe` width: 100%; height: 100%; - display: ${props => (props.shouldDisplay ? 'block' : 'none')}; + display: ${(props) => (props.shouldDisplay ? 'block' : 'none')}; ` const operations = { SEND_TRANSACTIONS: 'sendTransactions', @@ -51,13 +51,13 @@ function Apps({ const [appIsLoading, setAppIsLoading] = useState(true) const [iframeEl, setframeEl] = useState(null) - const getSelectedApp = () => appsList.find(e => e.id === selectedApp) + const getSelectedApp = () => appsList.find((e) => e.id === selectedApp) const sendMessageToIframe = (messageId, data) => { iframeEl.contentWindow.postMessage({ messageId, data }, getSelectedApp().url) } - const handleIframeMessage = async data => { + const handleIframeMessage = async (data) => { if (!data || !data.messageId) { console.warn('iframe: message without messageId') return @@ -109,7 +109,7 @@ function Apps({ } } - const iframeRef = useCallback(node => { + const iframeRef = useCallback((node) => { if (node !== null) { setframeEl(node) } @@ -156,7 +156,7 @@ function Apps({ } }, [iframeEl]) - const onSelectApp = appId => { + const onSelectApp = (appId) => { setAppIsLoading(true) setSelectedApp(appId) } diff --git a/src/routes/safe/components/Apps/sendTransactions.js b/src/routes/safe/components/Apps/sendTransactions.js index ac602fcc..18d2e000 100644 --- a/src/routes/safe/components/Apps/sendTransactions.js +++ b/src/routes/safe/components/Apps/sendTransactions.js @@ -28,7 +28,7 @@ const sendTransactions = ( const encodeMultiSendCalldata = multiSend.methods .multiSend( `0x${txs - .map(tx => + .map((tx) => [ web3.eth.abi.encodeParameter('uint8', 0).slice(-2), web3.eth.abi.encodeParameter('address', tx.to).slice(-40), diff --git a/src/routes/safe/components/Balances/Collectibles/components/Item.jsx b/src/routes/safe/components/Balances/Collectibles/components/Item.jsx index 6726b074..a9add3c3 100644 --- a/src/routes/safe/components/Balances/Collectibles/components/Item.jsx +++ b/src/routes/safe/components/Balances/Collectibles/components/Item.jsx @@ -16,7 +16,7 @@ const useStyles = makeStyles({ borderRadius: '8px', boxShadow: '0 0 10px 0 rgba(33, 48, 77, 0.10)', boxSizing: 'border-box', - cursor: props => (props.granted ? 'pointer' : 'default'), + cursor: (props) => (props.granted ? 'pointer' : 'default'), display: 'flex', flexDirection: 'column', flexGrow: '1', @@ -54,7 +54,7 @@ const useStyles = makeStyles({ zIndex: '5', }, image: { - backgroundColor: props => `#${props.backgroundColor}` || '#f0efee', + backgroundColor: (props) => `#${props.backgroundColor}` || '#f0efee', backgroundPosition: '50% 50%', backgroundRepeat: 'no-repeat', backgroundSize: 'contain', diff --git a/src/routes/safe/components/Balances/SendModal/index.jsx b/src/routes/safe/components/Balances/SendModal/index.jsx index 5bf4d6d0..a865518b 100644 --- a/src/routes/safe/components/Balances/SendModal/index.jsx +++ b/src/routes/safe/components/Balances/SendModal/index.jsx @@ -77,17 +77,17 @@ const SendModal = ({ activeScreenType, isOpen, onClose, recipientAddress, select const scalableModalSize = activeScreen === 'chooseTxType' - const handleTxCreation = txInfo => { + const handleTxCreation = (txInfo) => { setActiveScreen('reviewTx') setTx(txInfo) } - const handleCustomTxCreation = customTxInfo => { + const handleCustomTxCreation = (customTxInfo) => { setActiveScreen('reviewCustomTx') setTx(customTxInfo) } - const handleSendCollectible = txInfo => { + const handleSendCollectible = (txInfo) => { setActiveScreen('reviewCollectible') setTx(txInfo) } diff --git a/src/routes/safe/components/Balances/SendModal/screens/AddressBookInput/index.jsx b/src/routes/safe/components/Balances/SendModal/screens/AddressBookInput/index.jsx index b79b5ba3..fd2fc303 100644 --- a/src/routes/safe/components/Balances/SendModal/screens/AddressBookInput/index.jsx +++ b/src/routes/safe/components/Balances/SendModal/screens/AddressBookInput/index.jsx @@ -40,7 +40,7 @@ const textFieldInputStyle = makeStyles(() => ({ }, })) -const filterAddressBookWithContractAddresses = async addressBook => { +const filterAddressBookWithContractAddresses = async (addressBook) => { const abFlags = await Promise.all( addressBook.map(async ({ address }) => { return (await mustBeEthereumContractAddress(address)) === undefined @@ -49,7 +49,7 @@ const filterAddressBookWithContractAddresses = async addressBook => { return addressBook.filter((adbkEntry, index) => abFlags[index]) } -const isValidEnsName = name => /^([\w-]+\.)+(eth|test|xyz|luxe)$/.test(name) +const isValidEnsName = (name) => /^([\w-]+\.)+(eth|test|xyz|luxe)$/.test(name) const AddressBookInput = ({ classes, @@ -69,7 +69,7 @@ const AddressBookInput = ({ const [inputAddValue, setInputAddValue] = useState(recipientAddress) - const onAddressInputChanged = async addressValue => { + const onAddressInputChanged = async (addressValue) => { setInputAddValue(addressValue) let resolvedAddress = addressValue let isValidText @@ -92,7 +92,7 @@ const AddressBookInput = ({ // First removes the entries that are not contracts if the operation is custom tx const adbkToFilter = isCustomTx ? await filterAddressBookWithContractAddresses(addressBook) : addressBook // Then Filters the entries based on the input of the user - const filteredADBK = adbkToFilter.filter(adbkEntry => { + const filteredADBK = adbkToFilter.filter((adbkEntry) => { const { address, name } = adbkEntry return ( name.toLowerCase().includes(addressValue.toLowerCase()) || @@ -137,7 +137,7 @@ const AddressBookInput = ({ closeIcon={null} disableOpenOnFocus filterOptions={(optionsArray, { inputValue }) => - optionsArray.filter(item => { + optionsArray.filter((item) => { const inputLowerCase = inputValue.toLowerCase() const foundName = item.name.toLowerCase().includes(inputLowerCase) const foundAddress = item.address.toLowerCase().includes(inputLowerCase) @@ -145,7 +145,7 @@ const AddressBookInput = ({ }) } freeSolo - getOptionLabel={adbkEntry => adbkEntry.address || ''} + getOptionLabel={(adbkEntry) => adbkEntry.address || ''} id="free-solo-demo" onChange={(event, value) => { let address = '' @@ -164,7 +164,7 @@ const AddressBookInput = ({ }} open={!blurred} options={adbkList.toArray()} - renderInput={params => ( + renderInput={(params) => ( { + onChange={(event) => { setInputTouched(true) onAddressInputChanged(event.target.value) }} @@ -193,7 +193,7 @@ const AddressBookInput = ({ variant="filled" /> )} - renderOption={adbkEntry => { + renderOption={(adbkEntry) => { const { address, name } = adbkEntry return (
diff --git a/src/routes/safe/components/Balances/SendModal/screens/ReviewTx/index.jsx b/src/routes/safe/components/Balances/SendModal/screens/ReviewTx/index.jsx index d9bc143b..5e837447 100644 --- a/src/routes/safe/components/Balances/SendModal/screens/ReviewTx/index.jsx +++ b/src/routes/safe/components/Balances/SendModal/screens/ReviewTx/index.jsx @@ -53,7 +53,7 @@ const ReviewTx = ({ closeSnackbar, enqueueSnackbar, onClose, onPrev, tx }: Props const [gasCosts, setGasCosts] = useState('< 0.001') const [data, setData] = useState('') - const txToken = tokens.find(token => token.address === tx.token) + const txToken = tokens.find((token) => token.address === tx.token) const isSendingETH = txToken.address === ETH_ADDRESS const txRecipient = isSendingETH ? tx.recipientAddress : txToken.address diff --git a/src/routes/safe/components/Balances/SendModal/screens/SendCollectible/CollectibleSelectField/index.jsx b/src/routes/safe/components/Balances/SendModal/screens/SendCollectible/CollectibleSelectField/index.jsx index 27193eba..6e303952 100644 --- a/src/routes/safe/components/Balances/SendModal/screens/SendCollectible/CollectibleSelectField/index.jsx +++ b/src/routes/safe/components/Balances/SendModal/screens/SendCollectible/CollectibleSelectField/index.jsx @@ -67,10 +67,10 @@ const CollectibleSelectField = ({ initialValue, tokens }: SelectFieldProps) => { disabled={!tokens.length} initialValue={initialValue} name="nftTokenId" - renderValue={nftTokenId => } + renderValue={(nftTokenId) => } validate={required} > - {tokens.map(token => ( + {tokens.map((token) => ( {token.name} diff --git a/src/routes/safe/components/Balances/SendModal/screens/SendCollectible/TokenSelectField/index.jsx b/src/routes/safe/components/Balances/SendModal/screens/SendCollectible/TokenSelectField/index.jsx index 33ad3a2a..735c2d0f 100644 --- a/src/routes/safe/components/Balances/SendModal/screens/SendCollectible/TokenSelectField/index.jsx +++ b/src/routes/safe/components/Balances/SendModal/screens/SendCollectible/TokenSelectField/index.jsx @@ -69,10 +69,10 @@ const TokenSelectField = ({ assets, initialValue }: SelectFieldProps) => { disabled={!assetsAddresses.length} initialValue={initialValue} name="assetAddress" - renderValue={assetAddress => } + renderValue={(assetAddress) => } validate={required} > - {assetsAddresses.map(assetAddress => { + {assetsAddresses.map((assetAddress) => { const asset = assets[assetAddress] return ( diff --git a/src/routes/safe/components/Balances/SendModal/screens/SendCustomTx/index.jsx b/src/routes/safe/components/Balances/SendModal/screens/SendCustomTx/index.jsx index 90e40b1e..2039cfc3 100644 --- a/src/routes/safe/components/Balances/SendModal/screens/SendCustomTx/index.jsx +++ b/src/routes/safe/components/Balances/SendModal/screens/SendCustomTx/index.jsx @@ -36,7 +36,7 @@ import { sm } from '~/theme/variables' type Props = { initialValues: Object, onClose: () => void, - onNext: any => void, + onNext: (any) => void, recipientAddress: string, } @@ -103,7 +103,7 @@ const SendCustomTx = ({ initialValues, onClose, onNext, recipientAddress }: Prop shouldDisableSubmitButton = !selectedEntry.address } - const handleScan = value => { + const handleScan = (value) => { let scannedAddress = value if (scannedAddress.startsWith('ethereum:')) { @@ -128,7 +128,7 @@ const SendCustomTx = ({ initialValues, onClose, onNext, recipientAddress }: Prop {selectedEntry && selectedEntry.address ? (
{ + onKeyDown={(e) => { if (e.keyCode !== 9) { setSelectedEntry(null) } diff --git a/src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField/index.jsx b/src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField/index.jsx index 5d629c87..56af0967 100644 --- a/src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField/index.jsx +++ b/src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField/index.jsx @@ -64,10 +64,10 @@ const TokenSelectField = ({ classes, initialValue, isValid, tokens }: SelectFiel displayEmpty initialValue={initialValue} name="token" - renderValue={tokenAddress => } + renderValue={(tokenAddress) => } validate={required} > - {tokens.map(token => ( + {tokens.map((token) => ( {token.name} diff --git a/src/routes/safe/components/Balances/SendModal/screens/SendFunds/index.jsx b/src/routes/safe/components/Balances/SendModal/screens/SendFunds/index.jsx index 8950d711..92c5c273 100644 --- a/src/routes/safe/components/Balances/SendModal/screens/SendFunds/index.jsx +++ b/src/routes/safe/components/Balances/SendModal/screens/SendFunds/index.jsx @@ -39,7 +39,7 @@ import { sm } from '~/theme/variables' type Props = { initialValues: Object, onClose: () => void, - onNext: any => void, + onNext: (any) => void, recipientAddress?: string, selectedToken: string, } @@ -76,7 +76,7 @@ const SendFunds = ({ initialValues, onClose, onNext, recipientAddress, selectedT } }, [selectedEntry, pristine]) - const handleSubmit = values => { + const handleSubmit = (values) => { const submitValues = values // If the input wasn't modified, there was no mutation of the recipientAddress if (!values.recipientAddress) { @@ -110,9 +110,9 @@ const SendFunds = ({ initialValues, onClose, onNext, recipientAddress, selectedT const formState = args[2] const mutators = args[3] const { token: tokenAddress } = formState.values - const selectedTokenRecord = tokens.find(token => token.address === tokenAddress) + const selectedTokenRecord = tokens.find((token) => token.address === tokenAddress) - const handleScan = value => { + const handleScan = (value) => { let scannedAddress = value if (scannedAddress.startsWith('ethereum:')) { @@ -142,7 +142,7 @@ const SendFunds = ({ initialValues, onClose, onNext, recipientAddress, selectedT {selectedEntry && selectedEntry.address ? (
{ + onKeyDown={(e) => { if (e.keyCode !== 9) { setSelectedEntry(null) } diff --git a/src/routes/safe/components/Balances/Tokens/screens/TokenList/index.jsx b/src/routes/safe/components/Balances/Tokens/screens/TokenList/index.jsx index 1710ef8d..e87867e4 100644 --- a/src/routes/safe/components/Balances/Tokens/screens/TokenList/index.jsx +++ b/src/routes/safe/components/Balances/Tokens/screens/TokenList/index.jsx @@ -103,12 +103,12 @@ class Tokens extends React.Component { this.setState(() => ({ filter: '' })) } - onChangeSearchBar = value => { + onChangeSearchBar = (value) => { this.setState(() => ({ filter: value })) } onSwitch = (token: Token) => () => { - this.setState(prevState => { + this.setState((prevState) => { const activeTokensAddresses = prevState.activeTokensAddresses.has(token.address) ? prevState.activeTokensAddresses.remove(token.address) : prevState.activeTokensAddresses.add(token.address) diff --git a/src/routes/safe/components/Balances/utils/setTokenImgToPlaceholder.js b/src/routes/safe/components/Balances/utils/setTokenImgToPlaceholder.js index 011468b8..601ab9a4 100644 --- a/src/routes/safe/components/Balances/utils/setTokenImgToPlaceholder.js +++ b/src/routes/safe/components/Balances/utils/setTokenImgToPlaceholder.js @@ -1,7 +1,7 @@ // @flow import TokenPlaceholder from '~/routes/safe/components/Balances/assets/token_placeholder.svg' -export const setImageToPlaceholder = e => { +export const setImageToPlaceholder = (e) => { e.target.onerror = null e.target.src = TokenPlaceholder } diff --git a/src/routes/safe/components/DropdownCurrency/index.jsx b/src/routes/safe/components/DropdownCurrency/index.jsx index 39c64586..edb76daa 100644 --- a/src/routes/safe/components/DropdownCurrency/index.jsx +++ b/src/routes/safe/components/DropdownCurrency/index.jsx @@ -28,7 +28,7 @@ const DropdownCurrency = () => { const [searchParams, setSearchParams] = useState('') const classes = useDropdownStyles() - const currenciesListFiltered = currenciesList.filter(currency => + const currenciesListFiltered = currenciesList.filter((currency) => currency.toLowerCase().includes(searchParams.toLowerCase()), ) @@ -83,14 +83,14 @@ const DropdownCurrency = () => { input: classes.inputInput, }} inputProps={{ 'aria-label': 'search' }} - onChange={event => setSearchParams(event.target.value)} + onChange={(event) => setSearchParams(event.target.value)} placeholder="Search…" value={searchParams} />
- {currenciesListFiltered.map(currencyName => ( + {currenciesListFiltered.map((currencyName) => ( { - setValues(stateValues => ({ + setValues((stateValues) => ({ ...stateValues, ownerName: newValues.ownerName, ownerAddress: newValues.ownerAddress, @@ -106,7 +106,7 @@ const AddOwner = ({ } const thresholdSubmitted = (newValues: Object) => { - setValues(stateValues => ({ + setValues((stateValues) => ({ ...stateValues, threshold: newValues.threshold, })) diff --git a/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/OwnerForm/index.jsx b/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/OwnerForm/index.jsx index e6b59533..5409529e 100644 --- a/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/OwnerForm/index.jsx +++ b/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/OwnerForm/index.jsx @@ -38,10 +38,10 @@ type Props = { } const OwnerForm = ({ classes, onClose, onSubmit, owners }: Props) => { - const handleSubmit = values => { + const handleSubmit = (values) => { onSubmit(values) } - const ownerDoesntExist = uniqueAddress(owners.map(o => o.address)) + const ownerDoesntExist = uniqueAddress(owners.map((o) => o.address)) return ( <> diff --git a/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/Review/index.jsx b/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/Review/index.jsx index e22b1448..e30a67f4 100644 --- a/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/Review/index.jsx +++ b/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/Review/index.jsx @@ -113,7 +113,7 @@ const ReviewAddOwner = ({ classes, onClickBack, onClose, onSubmit, owners, safeA - {owners.map(owner => ( + {owners.map((owner) => ( diff --git a/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/ThresholdForm/index.jsx b/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/ThresholdForm/index.jsx index c79b0e61..0d57ac9c 100644 --- a/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/ThresholdForm/index.jsx +++ b/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/ThresholdForm/index.jsx @@ -32,7 +32,7 @@ type Props = { } const ThresholdForm = ({ classes, onClickBack, onClose, onSubmit, owners, threshold }: Props) => { - const handleSubmit = values => { + const handleSubmit = (values) => { onSubmit(values) } diff --git a/src/routes/safe/components/Settings/ManageOwners/EditOwnerModal/index.jsx b/src/routes/safe/components/Settings/ManageOwners/EditOwnerModal/index.jsx index e85ddca4..19058820 100644 --- a/src/routes/safe/components/Settings/ManageOwners/EditOwnerModal/index.jsx +++ b/src/routes/safe/components/Settings/ManageOwners/EditOwnerModal/index.jsx @@ -53,7 +53,7 @@ const EditOwnerComponent = ({ selectedOwnerName, updateAddressBookEntry, }: Props) => { - const handleSubmit = values => { + const handleSubmit = (values) => { const { ownerName } = values editSafeOwner({ safeAddress, ownerAddress, ownerName }) updateAddressBookEntry(makeAddressBookEntry({ address: ownerAddress, name: ownerName })) diff --git a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/index.jsx b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/index.jsx index b39e4015..a8454383 100644 --- a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/index.jsx +++ b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/index.jsx @@ -56,7 +56,9 @@ export const sendRemoveOwner = async ( ) => { const gnosisSafe = await getGnosisSafeInstanceAt(safeAddress) const safeOwners = await gnosisSafe.getOwners() - const index = safeOwners.findIndex(ownerAddress => ownerAddress.toLowerCase() === ownerAddressToRemove.toLowerCase()) + const index = safeOwners.findIndex( + (ownerAddress) => ownerAddress.toLowerCase() === ownerAddressToRemove.toLowerCase(), + ) const prevAddress = index === 0 ? SENTINEL_ADDRESS : safeOwners[index - 1] const txData = gnosisSafe.contract.methods .removeOwner(prevAddress, ownerAddressToRemove, values.threshold) diff --git a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/CheckOwner/index.jsx b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/CheckOwner/index.jsx index ce8b03d7..a6812212 100644 --- a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/CheckOwner/index.jsx +++ b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/CheckOwner/index.jsx @@ -28,7 +28,7 @@ type Props = { } const CheckOwner = ({ classes, onClose, onSubmit, ownerAddress, ownerName }: Props) => { - const handleSubmit = values => { + const handleSubmit = (values) => { onSubmit(values) } diff --git a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/Review/index.jsx b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/Review/index.jsx index 68bc83f6..fe080865 100644 --- a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/Review/index.jsx +++ b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/Review/index.jsx @@ -60,7 +60,7 @@ const ReviewRemoveOwner = ({ const { fromWei, toBN } = web3.utils const gnosisSafe = await getGnosisSafeInstanceAt(safeAddress) const safeOwners = await gnosisSafe.getOwners() - const index = safeOwners.findIndex(owner => owner.toLowerCase() === ownerAddress.toLowerCase()) + const index = safeOwners.findIndex((owner) => owner.toLowerCase() === ownerAddress.toLowerCase()) const prevAddress = index === 0 ? SENTINEL_ADDRESS : safeOwners[index - 1] const txData = gnosisSafe.contract.methods.removeOwner(prevAddress, ownerAddress, values.threshold).encodeABI() const estimatedGasCosts = await estimateTxGasCosts(safeAddress, safeAddress, txData) @@ -125,7 +125,7 @@ const ReviewRemoveOwner = ({ {owners.map( - owner => + (owner) => owner.address !== ownerAddress && ( diff --git a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/ThresholdForm/index.jsx b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/ThresholdForm/index.jsx index e47fdccc..3d4d015d 100644 --- a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/ThresholdForm/index.jsx +++ b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/ThresholdForm/index.jsx @@ -32,7 +32,7 @@ type Props = { } const ThresholdForm = ({ classes, onClickBack, onClose, onSubmit, owners, threshold }: Props) => { - const handleSubmit = values => { + const handleSubmit = (values) => { onSubmit(values) } const defaultThreshold = threshold > 1 ? threshold - 1 : threshold diff --git a/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/index.jsx b/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/index.jsx index a814319e..c1f414a1 100644 --- a/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/index.jsx +++ b/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/index.jsx @@ -54,7 +54,9 @@ export const sendReplaceOwner = async ( ) => { const gnosisSafe = await getGnosisSafeInstanceAt(safeAddress) const safeOwners = await gnosisSafe.getOwners() - const index = safeOwners.findIndex(ownerAddress => ownerAddress.toLowerCase() === ownerAddressToRemove.toLowerCase()) + const index = safeOwners.findIndex( + (ownerAddress) => ownerAddress.toLowerCase() === ownerAddressToRemove.toLowerCase(), + ) const prevAddress = index === 0 ? SENTINEL_ADDRESS : safeOwners[index - 1] const txData = gnosisSafe.contract.methods .swapOwner(prevAddress, ownerAddressToRemove, values.ownerAddress) diff --git a/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/screens/OwnerForm/index.jsx b/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/screens/OwnerForm/index.jsx index 47c7f4da..13f876b3 100644 --- a/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/screens/OwnerForm/index.jsx +++ b/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/screens/OwnerForm/index.jsx @@ -44,10 +44,10 @@ type Props = { } const OwnerForm = ({ classes, onClose, onSubmit, ownerAddress, ownerName, owners }: Props) => { - const handleSubmit = values => { + const handleSubmit = (values) => { onSubmit(values) } - const ownerDoesntExist = uniqueAddress(owners.map(o => o.address)) + const ownerDoesntExist = uniqueAddress(owners.map((o) => o.address)) return ( <> diff --git a/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/screens/Review/index.jsx b/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/screens/Review/index.jsx index fd5f7d67..9b1588ee 100644 --- a/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/screens/Review/index.jsx +++ b/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/screens/Review/index.jsx @@ -61,7 +61,7 @@ const ReviewRemoveOwner = ({ const { fromWei, toBN } = web3.utils const gnosisSafe = await getGnosisSafeInstanceAt(safeAddress) const safeOwners = await gnosisSafe.getOwners() - const index = safeOwners.findIndex(owner => owner.toLowerCase() === ownerAddress.toLowerCase()) + const index = safeOwners.findIndex((owner) => owner.toLowerCase() === ownerAddress.toLowerCase()) const prevAddress = index === 0 ? SENTINEL_ADDRESS : safeOwners[index - 1] const txData = gnosisSafe.contract.methods.swapOwner(prevAddress, ownerAddress, values.ownerAddress).encodeABI() const estimatedGasCosts = await estimateTxGasCosts(safeAddress, safeAddress, txData) @@ -125,7 +125,7 @@ const ReviewRemoveOwner = ({ {owners.map( - owner => + (owner) => owner.address !== ownerAddress && ( diff --git a/src/routes/safe/components/Settings/ManageOwners/index.jsx b/src/routes/safe/components/Settings/ManageOwners/index.jsx index 9baf42da..9b3876ef 100644 --- a/src/routes/safe/components/Settings/ManageOwners/index.jsx +++ b/src/routes/safe/components/Settings/ManageOwners/index.jsx @@ -135,7 +135,7 @@ class ManageOwners extends React.Component { } = this.state const columns = generateColumns() - const autoColumns = columns.filter(c => !c.custom) + const autoColumns = columns.filter((c) => !c.custom) const ownersAdbk = getOwnersWithNameFromAddressBook(addressBook, owners) const ownerData = getOwnerData(ownersAdbk) diff --git a/src/routes/safe/components/Settings/SafeDetails/index.jsx b/src/routes/safe/components/Settings/SafeDetails/index.jsx index 2bc19dfe..ef30a51c 100644 --- a/src/routes/safe/components/Settings/SafeDetails/index.jsx +++ b/src/routes/safe/components/Settings/SafeDetails/index.jsx @@ -57,10 +57,10 @@ const SafeDetails = (props: Props) => { const [isModalOpen, setModalOpen] = React.useState(false) const toggleModal = () => { - setModalOpen(prevOpen => !prevOpen) + setModalOpen((prevOpen) => !prevOpen) } - const handleSubmit = values => { + const handleSubmit = (values) => { updateSafe({ address: safeAddress, name: values.safeName }) const notification = getNotificationsFromTxType(TX_NOTIFICATION_TYPES.SAFE_NAME_CHANGE_TX) diff --git a/src/routes/safe/components/Settings/ThresholdSettings/ChangeThreshold/index.jsx b/src/routes/safe/components/Settings/ThresholdSettings/ChangeThreshold/index.jsx index be4b9bd3..4148e7b7 100644 --- a/src/routes/safe/components/Settings/ThresholdSettings/ChangeThreshold/index.jsx +++ b/src/routes/safe/components/Settings/ThresholdSettings/ChangeThreshold/index.jsx @@ -60,7 +60,7 @@ const ChangeThreshold = ({ classes, onChangeThreshold, onClose, owners, safeAddr } }, []) - const handleSubmit = values => { + const handleSubmit = (values) => { const newThreshold = values[THRESHOLD_FIELD_NAME] onClose() diff --git a/src/routes/safe/components/Settings/ThresholdSettings/index.jsx b/src/routes/safe/components/Settings/ThresholdSettings/index.jsx index 64655a61..bd364365 100644 --- a/src/routes/safe/components/Settings/ThresholdSettings/index.jsx +++ b/src/routes/safe/components/Settings/ThresholdSettings/index.jsx @@ -42,10 +42,10 @@ const ThresholdSettings = ({ const [isModalOpen, setModalOpen] = useState(false) const toggleModal = () => { - setModalOpen(prevOpen => !prevOpen) + setModalOpen((prevOpen) => !prevOpen) } - const onChangeThreshold = async newThreshold => { + const onChangeThreshold = async (newThreshold) => { const safeInstance = await getGnosisSafeInstanceAt(safeAddress) const txData = safeInstance.contract.methods.changeThreshold(newThreshold).encodeABI() diff --git a/src/routes/safe/components/Settings/index.jsx b/src/routes/safe/components/Settings/index.jsx index f6888c79..73d734b5 100644 --- a/src/routes/safe/components/Settings/index.jsx +++ b/src/routes/safe/components/Settings/index.jsx @@ -69,7 +69,7 @@ class Settings extends React.Component { } } - handleChange = menuOptionIndex => () => { + handleChange = (menuOptionIndex) => () => { this.setState({ menuOptionIndex }) } diff --git a/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/ApproveTxModal/index.jsx b/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/ApproveTxModal/index.jsx index cc294b3d..fbde98e1 100644 --- a/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/ApproveTxModal/index.jsx +++ b/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/ApproveTxModal/index.jsx @@ -114,7 +114,7 @@ const ApproveTxModal = ({ } }, [approveAndExecute]) - const handleExecuteCheckbox = () => setApproveAndExecute(prevApproveAndExecute => !prevApproveAndExecute) + const handleExecuteCheckbox = () => setApproveAndExecute((prevApproveAndExecute) => !prevApproveAndExecute) const approveTx = () => { processTransaction({ diff --git a/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/OwnersColumn/OwnersList.jsx b/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/OwnersColumn/OwnersList.jsx index d2142a93..55f2856f 100644 --- a/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/OwnersColumn/OwnersList.jsx +++ b/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/OwnersColumn/OwnersList.jsx @@ -42,7 +42,7 @@ const OwnersList = ({ userAddress, }: ListProps) => ( <> - {ownersWhoConfirmed.map(owner => ( + {ownersWhoConfirmed.map((owner) => ( ))} - {ownersUnconfirmed.map(owner => ( + {ownersUnconfirmed.map((owner) => ( { + tx.confirmations.forEach((conf) => { if (conf.owner.address === userAddress) { currentUserAlreadyConfirmed = true } @@ -55,12 +55,12 @@ function getOwnersConfirmations(tx, userAddress) { function getPendingOwnersConfirmations(owners, tx, userAddress) { const ownersUnconfirmed = owners.filter( - owner => tx.confirmations.findIndex(conf => conf.owner.address === owner.address) === -1, + (owner) => tx.confirmations.findIndex((conf) => conf.owner.address === owner.address) === -1, ) let userIsUnconfirmedOwner = false - ownersUnconfirmed.some(owner => { + ownersUnconfirmed.some((owner) => { userIsUnconfirmedOwner = owner.address === userAddress return userIsUnconfirmedOwner }) diff --git a/src/routes/safe/components/Transactions/TxsTable/index.jsx b/src/routes/safe/components/Transactions/TxsTable/index.jsx index 227ca0a9..6745c643 100644 --- a/src/routes/safe/components/Transactions/TxsTable/index.jsx +++ b/src/routes/safe/components/Transactions/TxsTable/index.jsx @@ -67,12 +67,12 @@ const TxsTable = ({ }: Props) => { const [expandedTx, setExpandedTx] = useState(null) - const handleTxExpand = safeTxHash => { - setExpandedTx(prevTx => (prevTx === safeTxHash ? null : safeTxHash)) + const handleTxExpand = (safeTxHash) => { + setExpandedTx((prevTx) => (prevTx === safeTxHash ? null : safeTxHash)) } const columns = generateColumns() - const autoColumns = columns.filter(c => !c.custom) + const autoColumns = columns.filter((c) => !c.custom) const filteredData = getTxTableData(transactions, cancellationTransactions) .sort((tx1, tx2) => { // First order by nonce diff --git a/src/routes/safe/container/selector.js b/src/routes/safe/container/selector.js index e7f4d503..dae16b04 100644 --- a/src/routes/safe/container/selector.js +++ b/src/routes/safe/container/selector.js @@ -58,8 +58,8 @@ const getTxStatus = (tx: Transaction, userAddress: string, safe: Safe): Transact } else if (!tx.confirmations.size) { txStatus = 'pending' } else { - const userConfirmed = tx.confirmations.filter(conf => conf.owner.address === userAddress).size === 1 - const userIsSafeOwner = safe.owners.filter(owner => owner.address === userAddress).size === 1 + const userConfirmed = tx.confirmations.filter((conf) => conf.owner.address === userAddress).size === 1 + const userIsSafeOwner = safe.owners.filter((owner) => owner.address === userAddress).size === 1 txStatus = !userConfirmed && userIsSafeOwner ? 'awaiting_your_confirmation' : 'awaiting_confirmations' } @@ -93,7 +93,7 @@ export const extendedSafeTokensSelector: Selector, balances: Map, tokensList: Map, ethAsToken: Token) => { - const extendedTokens = Map().withMutations(map => { + const extendedTokens = Map().withMutations((map) => { safeTokens.forEach((tokenAddress: string) => { const baseToken = tokensList.get(tokenAddress) const tokenBalance = balances.get(tokenAddress) diff --git a/src/routes/safe/store/actions/createTransaction.js b/src/routes/safe/store/actions/createTransaction.js index 5dd76b45..acebf417 100644 --- a/src/routes/safe/store/actions/createTransaction.js +++ b/src/routes/safe/store/actions/createTransaction.js @@ -98,13 +98,14 @@ const createTransaction = ({ try { // Here we're checking that safe contract version is greater or equal 1.1.1, but // theoretically EIP712 should also work for 1.0.0 contracts - // Also, offchain signatures are not working for ledger wallet because of a bug in their library: + // Also, offchain signatures are not working for ledger/trezor wallet because of a bug in their library: // https://github.com/LedgerHQ/ledgerjs/issues/378 + // Couldn't find an issue for trezor but the error is almost the same const canTryOffchainSigning = !isExecution && !smartContractWallet && - semverSatisfies(safeVersion, SAFE_VERSION_FOR_OFFCHAIN_SIGNATURES) && - !hardwareWallet + !hardwareWallet && + semverSatisfies(safeVersion, SAFE_VERSION_FOR_OFFCHAIN_SIGNATURES) if (canTryOffchainSigning) { const signature = await tryOffchainSigning({ ...txArgs, safeAddress }) diff --git a/src/routes/safe/store/actions/loadSafesFromStorage.js b/src/routes/safe/store/actions/loadSafesFromStorage.js index 6704387b..c6f6244e 100644 --- a/src/routes/safe/store/actions/loadSafesFromStorage.js +++ b/src/routes/safe/store/actions/loadSafesFromStorage.js @@ -14,7 +14,7 @@ const loadSafesFromStorage = () => async (dispatch: ReduxDispatch) const safes: ?{ [key: string]: SafeProps } = await loadFromStorage(SAFES_KEY) if (safes) { - Object.values(safes).forEach(safeProps => { + Object.values(safes).forEach((safeProps) => { dispatch(addSafe(buildSafe(safeProps))) }) } diff --git a/src/routes/safe/store/actions/processTransaction.js b/src/routes/safe/store/actions/processTransaction.js index 0b828f9f..263e0a05 100644 --- a/src/routes/safe/store/actions/processTransaction.js +++ b/src/routes/safe/store/actions/processTransaction.js @@ -83,13 +83,14 @@ const processTransaction = ({ try { // Here we're checking that safe contract version is greater or equal 1.1.1, but // theoretically EIP712 should also work for 1.0.0 contracts - // Also, offchain signatures are not working for ledger wallet because of a bug in their library: + // Also, offchain signatures are not working for ledger/trezor wallet because of a bug in their library: // https://github.com/LedgerHQ/ledgerjs/issues/378 + // Couldn't find an issue for trezor but the error is almost the same const canTryOffchainSigning = !isExecution && !smartContractWallet && - semverSatisfies(safeVersion, SAFE_VERSION_FOR_OFFCHAIN_SIGNATURES) && - !hardwareWallet + !hardwareWallet && + semverSatisfies(safeVersion, SAFE_VERSION_FOR_OFFCHAIN_SIGNATURES) if (canTryOffchainSigning) { const signature = await tryOffchainSigning({ ...txArgs, safeAddress }) diff --git a/src/routes/safe/store/middleware/safeStorage.js b/src/routes/safe/store/middleware/safeStorage.js index fbee8b5c..6aca88b8 100644 --- a/src/routes/safe/store/middleware/safeStorage.js +++ b/src/routes/safe/store/middleware/safeStorage.js @@ -36,7 +36,7 @@ const recalculateActiveTokens = (state: GlobalState): void => { const tokens = tokensSelector(state) const activeTokenAddresses = getActiveTokensAddressesForAllSafes(state) - const activeTokens: List = tokens.withMutations(map => { + const activeTokens: List = tokens.withMutations((map) => { map.forEach((token: Token) => { if (!activeTokenAddresses.has(token.address)) { map.remove(token.address) @@ -65,7 +65,7 @@ const safeStorageMware = (store: Store) => (next: Function) => asyn const { safe } = action.payload const ownersArray = safe.owners.toJS() // Adds the owners to the address book - ownersArray.forEach(owner => { + ownersArray.forEach((owner) => { dispatch(addAddressBookEntry(makeAddressBookEntry({ ...owner, isOwner: true }))) }) break diff --git a/src/utils/googleAnalytics.js b/src/utils/googleAnalytics.js index 6768020d..48ae64c7 100644 --- a/src/utils/googleAnalytics.js +++ b/src/utils/googleAnalytics.js @@ -39,7 +39,7 @@ export const withTracker = (WrappedComponent, options = {}) => { fetchCookiesFromStorage() }, []) - const trackPage = page => { + const trackPage = (page) => { if (!useAnalytics || !analyticsLoaded) { return } diff --git a/src/utils/timer.js b/src/utils/timer.js index aaa8356b..bd260688 100644 --- a/src/utils/timer.js +++ b/src/utils/timer.js @@ -1,2 +1,2 @@ // @flow -export const sleep: Function = (ms: number) => new Promise(resolve => setTimeout(resolve, ms)) +export const sleep: Function = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms))