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

fix: remove +L2 hotfix #3934

Merged
merged 4 commits into from
Jun 9, 2022
Merged

fix: remove +L2 hotfix #3934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0ff86b8
fix: remove hotfix
iamacook Jun 7, 2022
2b1fb05
fix: update `@gnosis.pm/safe-deployments`
iamacook Jun 7, 2022
bf5e20a
fix: update `@gnosis.pm/safe-deployments`
iamacook Jun 7, 2022
d4deb28
Merge branch 'remove-l2-hotfix' of github.com:gnosis/safe-react into …
iamacook Jun 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"@gnosis.pm/safe-apps-sdk": "7.3.0",
"@gnosis.pm/safe-apps-sdk-v1": "npm:@gnosis.pm/[email protected]",
"@gnosis.pm/safe-core-sdk": "^2.0.0",
"@gnosis.pm/safe-deployments": "^1.8.0",
"@gnosis.pm/safe-deployments": "^1.15.0",
"@gnosis.pm/safe-modules-deployments": "^1.0.0",
"@gnosis.pm/safe-react-components": "^1.1.2",
"@gnosis.pm/safe-react-gateway-sdk": "^3.0.1",
Expand Down
9 changes: 2 additions & 7 deletions src/logic/safe/store/reducer/safe.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,8 @@ const updateSafeProps = (prevSafe, safe) => {
: record.update(key, (current) => current.merge(safe[key]))
}
} else {
// Temp fix
if (key === 'currentVersion' && safe[key].endsWith('+L2')) {
record.set(key, safe[key].replace('+L2', ''))
} else {
// By default we overwrite the value. This is for strings, numbers and unset values
record.set(key, safe[key])
}
// By default we overwrite the value. This is for strings, numbers and unset values
record.set(key, safe[key])
}
})
})
Expand Down
14 changes: 14 additions & 0 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1867,6 +1867,13 @@
semver "^7.3.5"
web3-utils "^1.7.0"

"@gnosis.pm/safe-deployments@^1.15.0":
version "1.15.0"
resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-deployments/-/safe-deployments-1.15.0.tgz#71ed9a37437a3080443c49aa65308f2d8839d751"
integrity sha512-twfC5HNuj+TKS2gOowf6A1FGZfOLBHAV2JhYpmOCf2MKsfcG+Fe4TrSRgQg605MhWdwFiaGVpNkcwjvpxhGuew==
dependencies:
semver "^7.3.7"

"@gnosis.pm/safe-deployments@^1.8.0":
version "1.8.0"
resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-deployments/-/safe-deployments-1.8.0.tgz#856c15517274f924539ea4df40fffe6f009249a7"
Expand Down Expand Up @@ -15898,6 +15905,13 @@ semver@^7.2.1, semver@^7.3.2, semver@^7.3.5:
dependencies:
lru-cache "^6.0.0"

semver@^7.3.7:
version "7.3.7"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
dependencies:
lru-cache "^6.0.0"

semver@~5.4.1:
version "5.4.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
Expand Down