From 1ddd17423e12fb052dccc06c5a38a474dcbe1bfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Germ=C3=A1n=20Mart=C3=ADnez?= Date: Wed, 18 Dec 2019 13:35:03 +0100 Subject: [PATCH] Development (#378) * Adds cookie permissions to localStorage/redux state * Adds action * Adds files to git * (fix) linting issues * (update) flow-typed * (update) .eslint and .flowconfig * (add) cookie banner * Finish cookie banner implementation * (Add) checkbox's disabled style. * Removes redux for cookiesStorage * Fix cookieStore deletion * Fixs cookies acceptance * Fixs cookies banner verbiage Fix "x" in wrong place for snackbar messages * (remove) unused library * Adds cookies utils Replaces localStorage with cookies Adds js-cookie * (fix) added correct polished library and import, updated flow-typed * (update) removed polish flow type, added js-cookie flow type * Add link to cookie policy, use generic links for legal docs * Remove link to cookie policy from sidebar, link cookie policy in the banner * Let the user re-open the cookie banner * remove withMutations from cookies reducer, move utils/cookies to logic/cookies * Now the sidebar closes when the cookie banner is toggled * Feature #169: Intercom (#301) * Implements intercom Adds REACT_APP_INTERCOM_ID_MAINNET and REACT_APP_INTERCOM_ID_RINKEBY env vars * Adds .env.example * Adds intercom env vars * Updates env vars Replaces "rinkeby" and "mainnet" with "non-production" and "production" * Now loads intercom after the user accepted the analytics * Add env variable for production intercom id * Update .env.example * Removes react-intercom Fixs getIntercomId with default dev appID Now loads intercom as script * Renegerate flow-types * Remove 'Hide zero balances' (#310) * Use medium font size for 'select an asset' label (#312) * Feature #272: Google Analytics (#299) * Adds google analytics tracking for every route * Adds cookies acceptance check before tracking * Fix react-ga dependency * Fix cookieStore deletion * Merge with #189-cookie-banner * Fixs react ga version Refactored HOC with hooks * Fix TYPO * Fix path for cookies utils * Fix imports * remove flow type definition for polish * Add GA ID log * Fix load GA After cookies acceptance * Feature #224: Activate tokens automatically (#300) * Replace 'Manage Tokens' with 'Manage List' * prevent 301 redirects * Add `BLACKLISTED_TOKENS` key to persist through immortal * Add store/action to extract _activate tokens by its balance_ - keeps already activated tokens - discards blacklisted tokens - adds tokens whose vales are bigger than zero and are not blacklisted * Add `blacklistedTokens` list to safe's store * Display activeTokensByBalance in 'Balances' screen * Enable token's blacklisting functionality in Tokens List * Retrieve balance from API * Rename action to `activateTokensByBalance` * Fix linting errors - line too long - required return * Do not persist a separate list into `BLACKLISTED_TOKENS` * Typo fix (#326) * Fix security vulnerability: Remove uglifyjs, use terser plugin (#327) * Remove uglifyjs, use terser plugin * fix css-loader config * Feature #256: Sticky header (#308) * Add sticky header * Remove react-headroom, set position to fixed for header * Regenerate yarn lock * Remove unused headroom style from root.scss * Pull from dev, conflict fixes * Update welcome text (#323) * Feature #137: Tx list improvements (#222) * Fix swapOwners threshold displayed as hex in tx list * Refactor spinner in empty table * Fix number of rows per page in table pagination * Add use of EtherscanLink component * Set short version of strings in tx list * Adjust styles in tx list * Add more styles to table * WIP * An attempt to fix #204 by showing UNKNOWN instead of failed to fetch token symbol * Table pagination style fixes * Show confirm transaction button in owner list * Update dependencies * Add confirmation icons to owner list in tx list * exclude unneeded stuff from travis.yml * Adds cookie permissions to localStorage/redux state * Update dependencies * Adds action * Adds files to git * (fix) linting issues * (update) flow-typed * (update) .eslint and .flowconfig * (add) cookie banner * Finish cookie banner implementation * (Add) checkbox's disabled style. * Removes redux for cookiesStorage * Fix cookieStore deletion * Increase TO_EXP for bignumber.js * Fixs cookies acceptance * Fixs cookies banner verbiage Fix "x" in wrong place for snackbar messages * (fix) added correct polished library and import, updated flow-typed * (update) removed polish flow type, added js-cookie flow type * Add link to cookie policy, use generic links for legal docs * Remove link to cookie policy from sidebar, link cookie policy in the banner * Mock Safe creation transaction * Format code * Fix break statement * Remove deployment of storybook * Let the user re-open the cookie banner * Update tx status messages and visual confirmation progress * Fix svg in tx confirmation progress * Add styles to tx type in tx list * Replace nonce in tx list with tx id * Update opacity of cancelled tx * Fix short version of address * remove withMutations from cookies reducer, move utils/cookies to logic/cookies * Now the sidebar closes when the cookie banner is toggled * Fix styles in tx list * Add Pending status in tx description * (remove) unused library * Adds cookies utils Replaces localStorage with cookies Adds js-cookie * Set 25 rows per page in tx list by default * Align tx table * Adjust tx table and tx details borders * Fix fetching transactions to show Safe creation tx alone * Fix failed Safe creation transaction * Add styles to tx data * Refactor and fix owner list in transaction * Refactor use of theme variables * Remove storybook files * Update dependencies * Fix warnings * Fix dependencies * Update file-loader config * Fix owner colors in the tx confirmation progress * Fix transaction type icon height * Tx list adjustments * Update readme * (Feature) Etherscan button icon (#331) * (add) new open on etherscan button icon * (remove) unused asset * (fix) icon background * Feature #239: Replace early access label with network label (#311) * Remove early access label * Revert "Remove early access label" This reverts commit 34682f0f6d9c1974a6e45c2a31358864931d9c1e. * Replace early access label with network label * Capitalzie first letter of the network name * Adds threshold update on checkAndUpdateSafe (#320) * Feature #159: Pending transaction that requires user confirmation (#330) * Creates a new notification: waitingConfirmation Adds key as optional parameter for notification Implemented getAwaitingTransactions to get the transactions that needs to be confirmed by the current user Not fetchTransactions action also dispatch a notification for awaiting transactions Improved performance of routes/safe/container/index to avoid re-rendering * Removes notification logic on fetchTransactions Adds notificationsMiddleware * Moves fetchTransaction to container * Removes unused param on fetchTransactions * Fixs null safe check * Fixs middleware declaration * Removes lodash * Changes cancelled transaction detection logic * Feature #122: Multisig migration (#315) * Adds query-string package.json Parses query string on open layout * Implements load all the values on openSafe view from param querys * Adds query params validation * Moves query parse logic to open.jsx * Changes default no metamask component on open page * Replaces global isNaN * Fix threshold parsing validation * Updates the welcome component with new verbiage for open * Renames isOpenSafe to isOldMultisigMigration * Merge branch 'development' of https://github.com/gnosis/safe-react into 122-multisig-migration # Conflicts: # src/routes/open/components/Layout.jsx * Merge branch 'development' of https://github.com/gnosis/safe-react into 159-pending-transactions # Conflicts: # src/routes/safe/components/Transactions/index.jsx # yarn.lock * set anonymizeIp to true (#335) * Feature #180: Predict transaction nonce (#293) * Dep bump * Fetch transactions when safe view is mounted * eslint fix * Calculate new tx nonce from latest tx in service * Fix tx cancellation, allow passing nonce to createTransaction * dep bump * Refactor createTransaction/processTransaction to use object as argument * Adopting transactions table to new send tx flow with predicted nonces * dep bump, disable esModule in file-loader options after new v5 release * Don't show older tx annotation for already executed txs * sort tx by nonce * get new safe nonce after tx execution * Bugfixes * remove whitespace for showOlderTxAnnotation * Feature #329: Rename to Multisig (#334) * Rename to Multisig * migration text fix * replace safe for teams with multisig * Fixs race condition (#341) Fixs typo * (Feature) Incoming transactions (#333) * Add `blockNumber` to transactions model * Create `incomingTransaction` node in store and load it along with `transactions` * Add incoming transfers to the Transactions table * Rename `transactionHash` to `executionTxHash` for better incoming/outgoing txs unification in Transactions table * Add incoming transactions details * Add transaction type icon in table row * Add snackbar notification for incoming txs * Make incoming transaction snackbar to show on any tab * Use makeStyles hooks * Fix incoming amounts conversion from wei * Make concurrent promise calls * Use date to calculate transactions ids * Prevent repeating messages - also move logic to display snack bar into the notifications middleware * Merge transactions and incomingTxs to the transactions selector * Show 'Multiple incoming transfers' if they are more than 3 * Prevent incoming transactions snack bar for first-timer users * Set ID as the default order * Use constant for _incoming_ type * Feature #154: Fiat Balances (#290) * Adds DropdownCurrency Adds redux store for currencyValues Adds Value column on the assets table Adds mocked currency values * (add) base currency dropdown * (add) dropdown styles * Refactors data fetching of the balances list Now uses the endpoint * Fix column value styling * Adds support for ECB currency values * Fixs list overflow * Changes endpoint url Adds decimals for balance values * (fix) remove inline style * (add) currencies dropdown search field * (fix) list items' hover color * Implements filter search * Fix warning on dropdown template * Saves selected currency in localStorage * Remove spaces on curly braces Add alt Renames rowItem to cellItem Improves fetchCurrenciesRates handling * Removes withMutations * Removes middleware Export style to another file for dropdownCurrency * Adds classNames * Fix incomming transactions fetching (#346) * Feature: Activate fortmatic (#339) * Add fortmatic integration to web3connect * add fortmatic * Safe open form improvements: limit calling initContracts to 1 time * update .env.example * Feature #336: Confirmation required notification for non-owners fix (#338) * Refactors grantedSelector with isUserOwner function Checks if the user is owner of the safe before sending notification * Adds safeParamAddressFromStateSelector Refactors notificationsMiddleware with new selector * Remove old size check * safe notifications middleware fixes * add apt-get update to travis yml * (Fix) Incoming transactions inline-styles (#344) * Remove inline styles * Replace ternary with logical && operator * use cn as shortcut for classnames * Makes minMaxLength 2 to AddCustomToken (#363) * Fixs ETH display on balances list (#360) * Bug #348: Safelist entries get removed (#358) * Fix balances saved to localStorage not in format [tokenAdd, balance] but [balance] * Updates localStorage version value * Use submission instead of execution date to sort outgoing txs (#364) * Feature #190: Sidebar improvements (#347) * Change icons Adds checked icon * Adds safeParamAddressFromStateSelector for get current safe selected Implements check icon on sidebar * Remove overflow on sidebar Start alignments * Removes headerPlaceholder * Improves header * Improves header * Fix header style * use sameAddress function to check address eqaulity when fetching transactions (#365) * Bug #352: Owner shown multiple times (#367) * Ensure lowercased string comparison for owners' addresses * Use `sameAddress` for addresses comparison * Use transaction value as a string (#369) * Update isTokenTransfer to use value as a string * Rename error message * Update dependencies * Refactor * Fix alternative token abi and token address for incoming transactions (#373) * Bug #313: Payload breaks ui (#371) * Makes minMaxLength 2 to AddCustomToken * Fix styling * Fix typo * Feature #200: Show version number (#370) * Add `dotenv-expand` as a dependency * Add app version to sidebar * Add hardcoded latest safe version to env variables * Add `semver` to compare current vs latest version * Add Safe version to Safe Details * Adjustments in version number * Fix transaction description value (#377) * Fix transaction description value * Remove duplicated symbols * fix checkAndUpdateSafe logic (#379) * Update .env.example * update package json version * update package json version * Fix app version in side bar * add REACT_APP_APP_VERSION global env var * add react_app_version to build script * remove react_app_app_version from build-mainnet --- .env.example | 4 ++ package.json | 6 ++- scripts/build.js | 6 +-- scripts/start.js | 2 +- scripts/test.js | 2 +- src/components/Sidebar/LegalLinks.jsx | 5 ++ .../{ChangeSafeName => SafeDetails}/index.jsx | 47 ++++++++++++++++--- .../{ChangeSafeName => SafeDetails}/style.js | 3 ++ src/routes/safe/components/Settings/index.jsx | 6 +-- .../ExpandedTx/TxDescription/index.jsx | 33 +++++++------ src/routes/safe/store/actions/fetchSafe.js | 6 ++- src/test/safe.dom.settings.name.test.js | 2 +- yarn.lock | 25 ++++++++-- 13 files changed, 110 insertions(+), 37 deletions(-) rename src/routes/safe/components/Settings/{ChangeSafeName => SafeDetails}/index.jsx (62%) rename src/routes/safe/components/Settings/{ChangeSafeName => SafeDetails}/style.js (90%) diff --git a/.env.example b/.env.example index c927840d..9220d628 100644 --- a/.env.example +++ b/.env.example @@ -13,3 +13,7 @@ REACT_APP_PORTIS_ID= REACT_APP_SQUARELINK_ID= REACT_APP_FORTMATIC_KEY= +# Versions +REACT_APP_LATEST_SAFE_VERSION= +# Leave it untouched, version will set using dotenv-expand +REACT_APP_APP_VERSION=$npm_package_version diff --git a/package.json b/package.json index 96bc91d1..ecf0675d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "safe-react", - "version": "1.4.4", + "version": "1.6.0", "description": "Allowing crypto users manage funds in a safer way", "homepage": "https://github.com/gnosis/safe-react#readme", "bugs": { @@ -16,7 +16,7 @@ "test": "test" }, "scripts": { - "build": "node scripts/build.js", + "build": "REACT_APP_APP_VERSION=$npm_package_version node scripts/build.js", "build-mainnet": "REACT_APP_NETWORK=mainnet yarn build", "flow": "flow", "precommit": "./precommit.sh", @@ -73,6 +73,7 @@ "redux-actions": "^2.6.5", "redux-thunk": "^2.3.0", "reselect": "^4.0.0", + "semver": "^7.1.1", "squarelink": "^1.1.4", "web3": "1.2.4", "web3connect": "^1.0.0-beta.23" @@ -115,6 +116,7 @@ "classnames": "^2.2.6", "css-loader": "3.4.0", "detect-port": "^1.3.0", + "dotenv-expand": "^5.1.0", "eslint": "6.7.2", "eslint-config-airbnb": "18.0.1", "eslint-plugin-flowtype": "4.5.2", diff --git a/scripts/build.js b/scripts/build.js index 490a1778..5b57cb65 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -6,7 +6,7 @@ process.env.NODE_ENV = 'production'; // if this file is missing. dotenv will never modify any environment variables // that have already been set. // https://github.com/motdotla/dotenv -require('dotenv').config({silent: true}); +require('dotenv-expand')(require('dotenv').config({ silent: true })); var chalk = require('chalk'); var fs = require('fs-extra'); @@ -128,11 +128,11 @@ function build(previousSizeMap) { printErrors('Failed to compile A.', [err]); process.exit(1); } - + if (stats.compilation.errors.length) { printErrors('Failed to compile B.', stats.compilation.errors); process.exit(1); - } + } console.log(chalk.green('Compiled successfully.')); console.log(); diff --git a/scripts/start.js b/scripts/start.js index d57ef6f1..46b20619 100644 --- a/scripts/start.js +++ b/scripts/start.js @@ -5,7 +5,7 @@ process.env.NODE_ENV = 'development' // if this file is missing. dotenv will never modify any environment variables // that have already been set. // https://github.com/motdotla/dotenv -require('dotenv').config({ silent: true }) +require('dotenv-expand')(require('dotenv').config({ silent: true })) var chalk = require('chalk') var webpack = require('webpack') diff --git a/scripts/test.js b/scripts/test.js index 76223eff..21f9f5be 100644 --- a/scripts/test.js +++ b/scripts/test.js @@ -6,7 +6,7 @@ process.env.PUBLIC_URL = '' // if this file is missing. dotenv will never modify any environment variables // that have already been set. // https://github.com/motdotla/dotenv -require('dotenv').config({ silent: true }) +require('dotenv-expand')(require('dotenv').config({ silent: true })) const jest = require('jest') diff --git a/src/components/Sidebar/LegalLinks.jsx b/src/components/Sidebar/LegalLinks.jsx index 6f9a1a1a..29becd1b 100644 --- a/src/components/Sidebar/LegalLinks.jsx +++ b/src/components/Sidebar/LegalLinks.jsx @@ -25,6 +25,8 @@ type Props = { toggleSidebar: Function, } +const appVersion = process.env.REACT_APP_APP_VERSION ? `v${process.env.REACT_APP_APP_VERSION}` : 'Versions' + const LegalLinks = (props: Props) => { const classes = useStyles() const dispatch = useDispatch() @@ -51,6 +53,9 @@ const LegalLinks = (props: Props) => { Cookies + + {appVersion} + ) } diff --git a/src/routes/safe/components/Settings/ChangeSafeName/index.jsx b/src/routes/safe/components/Settings/SafeDetails/index.jsx similarity index 62% rename from src/routes/safe/components/Settings/ChangeSafeName/index.jsx rename to src/routes/safe/components/Settings/SafeDetails/index.jsx index 8b1e59f1..f9c4090a 100644 --- a/src/routes/safe/components/Settings/ChangeSafeName/index.jsx +++ b/src/routes/safe/components/Settings/SafeDetails/index.jsx @@ -1,7 +1,9 @@ // @flow -import React from 'react' -import { withStyles } from '@material-ui/core/styles' +import React, { useEffect } from 'react' +import { makeStyles } from '@material-ui/core/styles' import { withSnackbar } from 'notistack' +import semverLessThan from 'semver/functions/lt' +import semverValid from 'semver/functions/valid' import Block from '~/components/layout/Block' import Col from '~/components/layout/Col' import Field from '~/components/forms/Field' @@ -15,12 +17,12 @@ import Button from '~/components/layout/Button' import { getNotificationsFromTxType, showSnackbar } from '~/logic/notifications' import { TX_NOTIFICATION_TYPES } from '~/logic/safe/transactions' import { styles } from './style' +import { getSafeMasterContract } from '~/logic/contracts/safeContracts' export const SAFE_NAME_INPUT_TEST_ID = 'safe-name-input' export const SAFE_NAME_SUBMIT_BTN_TEST_ID = 'change-safe-name-btn' type Props = { - classes: Object, safeAddress: string, safeName: string, updateSafe: Function, @@ -28,9 +30,13 @@ type Props = { closeSnackbar: Function, } -const ChangeSafeName = (props: Props) => { +const useStyles = makeStyles(styles) + +const SafeDetails = (props: Props) => { + const classes = useStyles() + const [safeVersions, setSafeVersions] = React.useState({ current: null, latest: null, needUpdate: false }) const { - classes, safeAddress, safeName, updateSafe, enqueueSnackbar, closeSnackbar, + safeAddress, safeName, updateSafe, enqueueSnackbar, closeSnackbar, } = props const handleSubmit = (values) => { @@ -40,11 +46,40 @@ const ChangeSafeName = (props: Props) => { showSnackbar(notification.afterExecution.noMoreConfirmationsNeeded, enqueueSnackbar, closeSnackbar) } + useEffect(() => { + const getVersion = async () => { + let current + let latest + try { + const safeMaster = await getSafeMasterContract() + const safeMasterVersion = await safeMaster.VERSION() + current = semverValid(safeMasterVersion) + latest = semverValid(process.env.REACT_APP_LATEST_SAFE_VERSION) + const needUpdate = semverLessThan(current, latest) + + setSafeVersions({ current, latest, needUpdate }) + } catch (err) { + setSafeVersions({ current: current || 'Version not defined' }) + console.error(err) + } + } + getVersion() + }, []) + return ( <> {() => ( <> + + Safe Version + + + {safeVersions.current} + {safeVersions.needUpdate && ` (there's a newer version: ${safeVersions.latest})`} + + + Modify Safe name @@ -85,4 +120,4 @@ const ChangeSafeName = (props: Props) => { ) } -export default withStyles(styles)(withSnackbar(ChangeSafeName)) +export default withSnackbar(SafeDetails) diff --git a/src/routes/safe/components/Settings/ChangeSafeName/style.js b/src/routes/safe/components/Settings/SafeDetails/style.js similarity index 90% rename from src/routes/safe/components/Settings/ChangeSafeName/style.js rename to src/routes/safe/components/Settings/SafeDetails/style.js index e0fbf54c..16e3dfd8 100644 --- a/src/routes/safe/components/Settings/ChangeSafeName/style.js +++ b/src/routes/safe/components/Settings/SafeDetails/style.js @@ -23,4 +23,7 @@ export const styles = () => ({ width: '100%', borderTop: `2px solid ${border}`, }, + versionNumber: { + height: '21px', + }, }) diff --git a/src/routes/safe/components/Settings/index.jsx b/src/routes/safe/components/Settings/index.jsx index e66291f4..7b6709c1 100644 --- a/src/routes/safe/components/Settings/index.jsx +++ b/src/routes/safe/components/Settings/index.jsx @@ -13,7 +13,7 @@ import ButtonLink from '~/components/layout/ButtonLink' import RemoveSafeModal from './RemoveSafeModal' import Hairline from '~/components/layout/Hairline' import { type Owner } from '~/routes/safe/store/models/owner' -import ChangeSafeName from './ChangeSafeName' +import SafeDetails from './SafeDetails' import ThresholdSettings from './ThresholdSettings' import ManageOwners from './ManageOwners' import actions, { type Actions } from './actions' @@ -114,7 +114,7 @@ class Settings extends React.Component { className={cn(classes.menuOption, menuOptionIndex === 1 && classes.active)} onClick={this.handleChange(1)} > - Safe name + Safe details { {menuOptionIndex === 1 && ( - + )} {menuOptionIndex === 2 && ( ( +const TransferDescription = ({ amount = '', recipient }: TransferDescProps) => ( Send {' '} - {value} - {' '} - {symbol} + {amount} {' '} to: @@ -99,7 +97,7 @@ const SettingsDescription = ({ removedOwner, addedOwner, newThreshold }: Descrip ) const CustomDescription = ({ - data, value = 0, recipient, classes, + data, amount = 0, recipient, classes, }: CustomDescProps) => { const [showTxData, setShowTxData] = useState(false) return ( @@ -108,9 +106,7 @@ const CustomDescription = ({ Send {' '} - {value} - {' '} - ETH + {amount} {' '} to: @@ -156,18 +152,27 @@ const CustomDescription = ({ const TxDescription = ({ tx, classes }: Props) => { const { - recipient, value, modifySettingsTx, removedOwner, addedOwner, newThreshold, cancellationTx, customTx, creationTx, data, + recipient, + modifySettingsTx, + removedOwner, + addedOwner, + newThreshold, + cancellationTx, + customTx, + creationTx, + data, } = getTxData(tx) + const amount = getTxAmount(tx) return ( {modifySettingsTx && ( )} {customTx && ( - + )} {!cancellationTx && !modifySettingsTx && !customTx && !creationTx && ( - + )} ) diff --git a/src/routes/safe/store/actions/fetchSafe.js b/src/routes/safe/store/actions/fetchSafe.js index 427a905c..af405764 100644 --- a/src/routes/safe/store/actions/fetchSafe.js +++ b/src/routes/safe/store/actions/fetchSafe.js @@ -63,14 +63,16 @@ export const checkAndUpdateSafe = (safeAddress: string) => async (dispatch: Redu // If the remote owners does not contain a local address, we remove that local owner localOwners.forEach((localAddress) => { - if (remoteOwners.findIndex((remoteAddress) => sameAddress(remoteAddress, localAddress)) !== -1) { + const remoteOwnerIndex = remoteOwners.findIndex((remoteAddress) => sameAddress(remoteAddress, localAddress)) + if (remoteOwnerIndex === -1) { dispatch(removeSafeOwner({ safeAddress, ownerAddress: localAddress })) } }) // If the remote has an owner that we don't have locally, we add it remoteOwners.forEach((remoteAddress) => { - if (localOwners.findIndex((localAddress) => sameAddress(remoteAddress, localAddress)) !== -1) { + const localOwnerIndex = localOwners.findIndex((localAddress) => sameAddress(remoteAddress, localAddress)) + if (localOwnerIndex === -1) { dispatch(addSafeOwner({ safeAddress, ownerAddress: remoteAddress, ownerName: 'UNKNOWN' })) } }) diff --git a/src/test/safe.dom.settings.name.test.js b/src/test/safe.dom.settings.name.test.js index be02aa5e..49822695 100644 --- a/src/test/safe.dom.settings.name.test.js +++ b/src/test/safe.dom.settings.name.test.js @@ -6,7 +6,7 @@ import { renderSafeView } from '~/test/builder/safe.dom.utils' import { sleep } from '~/utils/timer' import '@testing-library/jest-dom/extend-expect' import { SETTINGS_TAB_BTN_TEST_ID, SAFE_VIEW_NAME_HEADING_TEST_ID } from '~/routes/safe/components/Layout' -import { SAFE_NAME_INPUT_TEST_ID, SAFE_NAME_SUBMIT_BTN_TEST_ID } from '~/routes/safe/components/Settings/ChangeSafeName' +import { SAFE_NAME_INPUT_TEST_ID, SAFE_NAME_SUBMIT_BTN_TEST_ID } from '~/routes/safe/components/Settings/SafeDetails' describe('DOM > Feature > Settings - Name', () => { let store diff --git a/yarn.lock b/yarn.lock index 3d24bc38..4eff8e74 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5621,6 +5621,11 @@ dot-prop@^4.1.0, dot-prop@^4.1.1: dependencies: is-obj "^1.0.0" +dotenv-expand@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" + integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA== + dotenv@^8.2.0: version "8.2.0" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a" @@ -13869,10 +13874,10 @@ resolve@1.1.7: resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= -resolve@^1.1.6, resolve@^1.1.7, resolve@^1.13.1, resolve@^1.4.0, resolve@~1.13.1: - version "1.13.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.13.1.tgz#be0aa4c06acd53083505abb35f4d66932ab35d16" - integrity sha512-CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w== +resolve@^1.1.6, resolve@^1.1.7, resolve@^1.4.0: + version "1.14.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.14.0.tgz#6d14c6f9db9f8002071332b600039abf82053f64" + integrity sha512-uviWSi5N67j3t3UKFxej1loCH0VZn5XuqdNxoLShPcYPw6cUZn74K1VRj+9myynRX03bxIBEkwlkob/ujLsJVw== dependencies: path-parse "^1.0.6" @@ -13883,6 +13888,13 @@ resolve@^1.10.0, resolve@^1.12.0, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.8.1 dependencies: path-parse "^1.0.6" +resolve@^1.13.1, resolve@~1.13.1: + version "1.13.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.13.1.tgz#be0aa4c06acd53083505abb35f4d66932ab35d16" + integrity sha512-CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w== + dependencies: + path-parse "^1.0.6" + responselike@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" @@ -14243,6 +14255,11 @@ semver@^6.0.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== +semver@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.1.1.tgz#29104598a197d6cbe4733eeecbe968f7b43a9667" + integrity sha512-WfuG+fl6eh3eZ2qAf6goB7nhiCd7NPXhmyFxigB/TOkQyeLP8w8GsVehvtGNtnNmyboz4TgeK40B1Kbql/8c5A== + semver@~5.4.1: version "5.4.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"