diff --git a/package.json b/package.json index 6389c48b..d7c186c1 100644 --- a/package.json +++ b/package.json @@ -115,7 +115,7 @@ "eslint-plugin-import": "2.18.2", "eslint-plugin-jest": "22.17.0", "eslint-plugin-jsx-a11y": "6.2.3", - "eslint-plugin-react": "7.14.3", + "eslint-plugin-react": "7.15.0", "ethereumjs-abi": "0.6.8", "extract-text-webpack-plugin": "^4.0.0-beta.0", "file-loader": "4.2.0", diff --git a/src/logic/contracts/safeContracts.js b/src/logic/contracts/safeContracts.js index 7c757acf..30a005ed 100644 --- a/src/logic/contracts/safeContracts.js +++ b/src/logic/contracts/safeContracts.js @@ -36,7 +36,7 @@ const instanciateMasterCopies = async () => { const ProxyFactory = getCreateProxyFactoryContract(web3) proxyFactoryMaster = await ProxyFactory.deployed() - // Initialize safe master copy + // Initialize Safe master copy const GnosisSafe = getGnosisSafeContract(web3) safeMaster = await GnosisSafe.deployed() } diff --git a/src/logic/safe/utils/safeStorage.js b/src/logic/safe/utils/safeStorage.js index c8e092d0..4883e134 100644 --- a/src/logic/safe/utils/safeStorage.js +++ b/src/logic/safe/utils/safeStorage.js @@ -22,7 +22,7 @@ export const saveSafes = async (safes: Object) => { try { await saveToStorage(SAFES_KEY, safes) } catch (err) { - console.error('Error storing safe info in localstorage', err) + console.error('Error storing Safe info in localstorage', err) } } @@ -52,7 +52,7 @@ export const saveDefaultSafe = async (safeAddress: string): Promise => { await saveToStorage(DEFAULT_SAFE_KEY, safeAddress) } catch (err) { // eslint-disable-next-line - console.error('Error saving default safe to storage: ', err) + console.error('Error saving default Safe to storage: ', err) } } diff --git a/src/logic/tokens/utils/tokensStorage.js b/src/logic/tokens/utils/tokensStorage.js index ec1785c8..b17616a3 100644 --- a/src/logic/tokens/utils/tokensStorage.js +++ b/src/logic/tokens/utils/tokensStorage.js @@ -6,7 +6,7 @@ import { loadFromStorage, saveToStorage } from '~/utils/storage' export const ACTIVE_TOKENS_KEY = 'ACTIVE_TOKENS' export const CUSTOM_TOKENS_KEY = 'CUSTOM_TOKENS' -// Tokens which are active at least in one of used safes in the app should be saved to localstorage +// Tokens which are active at least in one of used Safes in the app should be saved to localstorage // to avoid iterating a large amount of data of tokens from the backend // Custom tokens should be saved too unless they're deleted (marking them as inactive doesn't count) diff --git a/src/routes/load/components/DetailsForm/index.jsx b/src/routes/load/components/DetailsForm/index.jsx index 86f0268e..da0f8fd3 100644 --- a/src/routes/load/components/DetailsForm/index.jsx +++ b/src/routes/load/components/DetailsForm/index.jsx @@ -41,8 +41,8 @@ const styles = () => ({ }, }) -export const SAFE_INSTANCE_ERROR = 'Address given is not a safe instance' -export const SAFE_MASTERCOPY_ERROR = 'Mastercopy used by this safe is not the same' +export const SAFE_INSTANCE_ERROR = 'Address given is not a Safe instance' +export const SAFE_MASTERCOPY_ERROR = 'Mastercopy used by this Safe is not the same' // In case of an error here, it will be swallowed by final-form // So if you're experiencing any strang behaviours like freeze or hanging @@ -135,13 +135,13 @@ const Details = ({ classes, errors, form }: Props) => ( By continuing you consent with the - {' '} + terms of use - {' '} + and - {' '} + privacy policy diff --git a/src/routes/open/components/Layout.stories.js b/src/routes/open/components/Layout.stories.js index 08606dc3..995d0164 100644 --- a/src/routes/open/components/Layout.stories.js +++ b/src/routes/open/components/Layout.stories.js @@ -17,7 +17,7 @@ const store = new Store({ storiesOf('Routes /open', module) .addDecorator(FrameDecorator) - .add('Open safe with all props set', () => { + .add('Open Safe with all props set', () => { getProviderInfo() const provider = 'METAMASK' const userAccount = '0x03db1a8b26d08df23337e9276a36b474510f0023' diff --git a/src/routes/opening/Layout.stories.js b/src/routes/opening/Layout.stories.js index 940a9062..6aea6dae 100644 --- a/src/routes/opening/Layout.stories.js +++ b/src/routes/opening/Layout.stories.js @@ -9,7 +9,7 @@ const FrameDecorator = (story) =>
{story()}
storiesOf('Routes /opening', module) .addDecorator(FrameDecorator) - .add('View while safe is being deployed', () => ( + .add('View while Safe is being deployed', () => ( 0 it would send ETH from the safe + // if txAmount > 0 it would send ETH from the Safe txAmount = 0 } diff --git a/src/routes/safe/components/Transactions/NoTransactions/index.jsx b/src/routes/safe/components/Transactions/NoTransactions/index.jsx index a2ed8291..5048bf23 100644 --- a/src/routes/safe/components/Transactions/NoTransactions/index.jsx +++ b/src/routes/safe/components/Transactions/NoTransactions/index.jsx @@ -11,7 +11,7 @@ const NoTransactions = () => ( - No transactions found for this safe + No transactions found for this Safe diff --git a/src/routes/safe/store/actions/fetchSafe.js b/src/routes/safe/store/actions/fetchSafe.js index f49577a6..84c1eb63 100644 --- a/src/routes/safe/store/actions/fetchSafe.js +++ b/src/routes/safe/store/actions/fetchSafe.js @@ -43,7 +43,7 @@ export default (safeAddress: string) => async (dispatch: ReduxDispatch async (dispatch: ReduxDispatch) => { dispatch(setDefaultSafe(defaultSafe)) } catch (err) { // eslint-disable-next-line - console.error('Error while getting defautl safe from storage:', err) + console.error('Error while getting defautl Safe from storage:', err) } } diff --git a/src/routes/safe/store/actions/loadSafesFromStorage.js b/src/routes/safe/store/actions/loadSafesFromStorage.js index 1923e12b..411adc30 100644 --- a/src/routes/safe/store/actions/loadSafesFromStorage.js +++ b/src/routes/safe/store/actions/loadSafesFromStorage.js @@ -18,7 +18,7 @@ const loadSafesFromStorage = () => async (dispatch: ReduxDispatch) } } catch (err) { // eslint-disable-next-line - console.error('Error while getting safes from storage:', err) + console.error('Error while getting Safes from storage:', err) } return Promise.resolve() diff --git a/src/routes/safe/store/reducer/safe.js b/src/routes/safe/store/reducer/safe.js index bdb4e393..bd05e0de 100644 --- a/src/routes/safe/store/reducer/safe.js +++ b/src/routes/safe/store/reducer/safe.js @@ -59,7 +59,7 @@ export default handleActions( [ADD_SAFE]: (state: SafeReducerState, action: ActionType): SafeReducerState => { const { safe }: { safe: SafeProps } = action.payload - // if you add a new safe it needs to be set as a record + // if you add a new Safe it needs to be set as a record // in case of update it shouldn't, because a record would be initialized // with initial props and it would overwrite existing ones diff --git a/src/test/builder/safe.dom.builder.js b/src/test/builder/safe.dom.builder.js index 80bf6bfe..feac6704 100644 --- a/src/test/builder/safe.dom.builder.js +++ b/src/test/builder/safe.dom.builder.js @@ -17,14 +17,14 @@ export type DomSafe = { export const renderSafeInDom = async (owners: number = 1, threshold: number = 1): Promise => { // create store const store = aNewStore() - // deploy safe updating store + // deploy Safe updating store const address = await aMinedSafe(store, owners, threshold) // have available accounts const accounts = await getWeb3().eth.getAccounts() // navigate to SAFE route const SafeDom = renderSafeView(store, address) - // add funds to safe + // add funds to Safe await sendEtherTo(address, '0.1') // wait until funds are displayed and buttons are enabled await sleep(3000) diff --git a/src/test/safe.dom.create.test.js b/src/test/safe.dom.create.test.js index 7b8759ff..7a2ab7f0 100644 --- a/src/test/safe.dom.create.test.js +++ b/src/test/safe.dom.create.test.js @@ -107,7 +107,7 @@ const deploySafe = async (createSafeForm: any, threshold: number, numOwners: num fireEvent.submit(form) }) - // giving some time to the component for updating its state with safe + // giving some time to the component for updating its state with Safe // before destroying its context return whenSafeDeployed() } @@ -120,8 +120,8 @@ const aDeployedSafe = async (specificStore: Store, threshold?: numb return safeAddress } -describe('DOM > Feature > CREATE a safe', () => { - it('fills correctly the safe form with 4 owners and 4 threshold and creates a safe', async () => { +describe('DOM > Feature > CREATE a Safe', () => { + it('fills correctly the Safe form with 4 owners and 4 threshold and creates a Safe', async () => { const owners = 4 const threshold = 4 const store = aNewStore() diff --git a/src/test/safe.dom.load.test.js b/src/test/safe.dom.load.test.js index ae058b97..4bd3f08b 100644 --- a/src/test/safe.dom.load.test.js +++ b/src/test/safe.dom.load.test.js @@ -42,8 +42,8 @@ const renderLoadSafe = async (localStore: Store) => { ) } -describe('DOM > Feature > LOAD a safe', () => { - it('load correctly a created safe', async () => { +describe('DOM > Feature > LOAD a Safe', () => { + it('load correctly a created Safe', async () => { const store = aNewStore() const address = await aMinedSafe(store) const LoadSafePage = await renderLoadSafe(store) diff --git a/src/test/safe.dom.settings.name.test.js b/src/test/safe.dom.settings.name.test.js index 9f6af79a..be02aa5e 100644 --- a/src/test/safe.dom.settings.name.test.js +++ b/src/test/safe.dom.settings.name.test.js @@ -17,7 +17,7 @@ describe('DOM > Feature > Settings - Name', () => { safeAddress = await aMinedSafe(store) }) - it('Changes safe name', async () => { + it('Changes Safe name', async () => { const INITIAL_NAME = 'Safe Name' const NEW_NAME = 'NEW SAFE NAME' diff --git a/src/test/safe.dom.sidebar.test.js b/src/test/safe.dom.sidebar.test.js index d1f4bfa5..0c6e718a 100644 --- a/src/test/safe.dom.sidebar.test.js +++ b/src/test/safe.dom.sidebar.test.js @@ -16,7 +16,7 @@ describe('DOM > Feature > Sidebar', () => { safeAddress = await aMinedSafe(store) }) - it('Shows "default" label for a single safe', async () => { + it('Shows "default" label for a single Safe', async () => { const SafeDom = await renderSafeView(store, safeAddress) act(() => { @@ -29,7 +29,7 @@ describe('DOM > Feature > Sidebar', () => { expect(safes[0]).toContainElement(SafeDom.getByText('default')) }) - it('Changes default safe', async () => { + it('Changes default Safe', async () => { const SafeDom = await renderSafeView(store, safeAddress) await aMinedSafe(store) diff --git a/yarn.lock b/yarn.lock index 9abf83aa..87a59796 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7335,20 +7335,20 @@ eslint-plugin-jsx-a11y@6.2.3: has "^1.0.3" jsx-ast-utils "^2.2.1" -eslint-plugin-react@7.14.3: - version "7.14.3" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.14.3.tgz#911030dd7e98ba49e1b2208599571846a66bdf13" - integrity sha512-EzdyyBWC4Uz2hPYBiEJrKCUi2Fn+BJ9B/pJQcjw5X+x/H2Nm59S4MJIvL4O5NEE0+WbnQwEBxWY03oUk+Bc3FA== +eslint-plugin-react@7.15.0: + version "7.15.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.15.0.tgz#4808b19cf7b4c439454099d4eb8f0cf0e9fe31dd" + integrity sha512-NbIh/yVXoltm8Df28PiPRanfCZAYubGqXU391MTCpW955Vum7S0nZdQYXGAvDh9ye4aNCmOR6YcYZsfMbEQZQA== dependencies: array-includes "^3.0.3" doctrine "^2.1.0" has "^1.0.3" - jsx-ast-utils "^2.1.0" + jsx-ast-utils "^2.2.1" object.entries "^1.1.0" object.fromentries "^2.0.0" object.values "^1.1.0" prop-types "^15.7.2" - resolve "^1.10.1" + resolve "^1.12.0" eslint-scope@^3.7.1: version "3.7.3" @@ -11359,7 +11359,7 @@ jss@10.0.0, jss@^10.0.0: is-in-browser "^1.1.3" tiny-warning "^1.0.2" -jsx-ast-utils@^2.1.0, jsx-ast-utils@^2.2.1: +jsx-ast-utils@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.1.tgz#4d4973ebf8b9d2837ee91a8208cc66f3a2776cfb" integrity sha512-v3FxCcAf20DayI+uxnCuw795+oOIkVu6EnJ1+kSzhqqTZHNkTZ7B66ZgLp4oLJ/gbA64cI0B7WRoHZMSRdyVRQ== @@ -15605,7 +15605,7 @@ resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.3.2 dependencies: path-parse "^1.0.6" -resolve@^1.10.1, resolve@^1.12.0: +resolve@^1.12.0: version "1.12.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6" integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==