Skip to content
This repository was archived by the owner on Sep 25, 2025. It is now read-only.

solution: release v2.12.0 #1396

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

solution: release v2.12.0 #1396

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
6d35d8e
solution: release v2.12.0
splix May 6, 2025
624315a
problem: error when editing an allowance for a token not in registry
splix May 15, 2025
8a81d5f
problem: inputs on the Receive screen do overlap each other
splix May 16, 2025
c530965
solution: release v2.12.1
splix May 16, 2025
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
6 changes: 1 addition & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,5 @@
},
"workspaces": [
"packages/*"
],
"resolutions": {
"@emeraldpay/emerald-vault-core": "https://artifacts.emerald.cash/builds/vault-node/de4af83e/emeraldpay-emerald-vault-core-v0.14.0-dev.tgz",
"@emeraldpay/emerald-vault-native": "https://artifacts.emerald.cash/builds/vault-node/de4af83e/emeraldpay-emerald-vault-native-v0.14.0-dev.tgz"
}
]
}
4 changes: 2 additions & 2 deletions packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@emeraldwallet/core",
"version": "2.12.0-dev",
"version": "2.12.1",
"main": "lib/index.js",
"types": "lib/index.d.ts",
"author": "Emerald Team",
Expand All @@ -15,7 +15,7 @@
"dependencies": {
"@emeraldpay/bigamount": "^0.4.2",
"@emeraldpay/bigamount-crypto": "^0.4.2",
"@emeraldpay/emerald-vault-core": "^0.14.0-dev",
"@emeraldpay/emerald-vault-core": "^0.14.0",
"@ethereumjs/common": "^3.2.0",
"@ethereumjs/tx": "^4.2.0",
"@ethersproject/abi": "^5.8.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/desktop/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@emeraldwallet/desktop",
"productName": "EmeraldWallet",
"version": "2.12.0-dev",
"version": "2.12.1",
"description": "Emerald - Cryptocurrency Wallet",
"keywords": [
"blockchain",
Expand Down Expand Up @@ -55,8 +55,8 @@
},
"dependencies": {
"@electron/remote": "^2.1.2",
"@emeraldwallet/electron-app": "2.12.0-dev",
"@emeraldwallet/ui": "2.12.0-dev",
"@emeraldwallet/electron-app": "2.12.1",
"@emeraldwallet/ui": "2.12.1",
"core-js": "^3.41.0",
"electron-log": "^4.4.8",
"node-fetch": "^3.3.2",
Expand Down
12 changes: 6 additions & 6 deletions packages/electron-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@emeraldwallet/electron-app",
"version": "2.12.0-dev",
"version": "2.12.1",
"description": "Emerald Wallet Electron Shell",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand All @@ -14,11 +14,11 @@
"compile": "tsc -b"
},
"dependencies": {
"@emeraldpay/emerald-vault-core": "^0.14.0-dev",
"@emeraldpay/emerald-vault-native": "^0.14.0-dev",
"@emeraldwallet/core": "2.12.0-dev",
"@emeraldwallet/persistent-state": "2.12.0-dev",
"@emeraldwallet/services": "2.12.0-dev",
"@emeraldpay/emerald-vault-core": "^0.14.0",
"@emeraldpay/emerald-vault-native": "^0.14.0",
"@emeraldwallet/core": "2.12.1",
"@emeraldwallet/persistent-state": "2.12.1",
"@emeraldwallet/services": "2.12.1",
"electron-log": "^4.4.8",
"electron-store": "^8.2.0",
"uuid": "^9.0.1"
Expand Down
71 changes: 13 additions & 58 deletions packages/persistent-state/native/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/persistent-state/native/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ crate-type = ["cdylib"]
[dependencies]
#emerald-wallet-state = { path = "../../../../emerald-wallet-state" }
emerald-wallet-state = { git = "https://github.com/emeraldpay/emerald-wallet-state", branch = "master" }
#emerald-vault = "0.34.0"
emerald-vault = { git = "https://github.com/emeraldpay/emerald-vault" }
emerald-vault = "0.35"
#emerald-vault = { git = "https://github.com/emeraldpay/emerald-vault" }
bitcoin = "0.32.5"
lazy_static = "1.4.0"
serde = "1.0"
Expand Down
6 changes: 3 additions & 3 deletions packages/persistent-state/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@emeraldwallet/persistent-state",
"version": "2.12.0-dev",
"version": "2.12.1",
"main": "lib/index.js",
"author": "Emerald Team",
"license": "Apache-2.0",
Expand All @@ -13,9 +13,9 @@
"test:coverage": "jest --coverage"
},
"dependencies": {
"@emeraldpay/emerald-vault-core": "^0.14.0-dev",
"@emeraldpay/emerald-vault-core": "^0.14.0",
"@emeraldpay/neon-frame": "^0.2.0",
"@emeraldwallet/core": "2.12.0-dev"
"@emeraldwallet/core": "2.12.1"
},
"devDependencies": {
"cargo-cp-artifact": "^0.1.9",
Expand Down
10 changes: 5 additions & 5 deletions packages/react-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@emeraldwallet/react-app",
"version": "2.12.0-dev",
"version": "2.12.1",
"description": "Emerald Wallet React Application",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand All @@ -20,10 +20,10 @@
"@electron/remote": "^2.1.2",
"@emeraldpay/bigamount": "^0.4.2",
"@emeraldpay/bigamount-crypto": "^0.4.2",
"@emeraldpay/emerald-vault-core": "^0.14.0-dev",
"@emeraldwallet/core": "2.12.0-dev",
"@emeraldwallet/store": "2.12.0-dev",
"@emeraldwallet/ui": "2.12.0-dev",
"@emeraldpay/emerald-vault-core": "^0.14.0",
"@emeraldwallet/core": "2.12.1",
"@emeraldwallet/store": "2.12.1",
"@emeraldwallet/ui": "2.12.1",
"@emotion/react": "^11.14.0",
"@emotion/styled": "^11.14.0",
"@ethersproject/hash": "^5.8.0",
Expand Down
5 changes: 4 additions & 1 deletion packages/react-app/src/receive/ReceiveScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,11 +233,12 @@ const ReceiveScreen: React.FC<DispatchProps & OwnProps & StateProps> = ({
{wallet != null && <WalletReference balances={balances} wallet={wallet} walletIcon={walletIcon} />}
<Grid container>
<Grid item xs={8}>
<Grid container className={classes.form}>
<Grid container spacing={2} className={classes.form}>
<Grid item xs={9}>
<FormControl fullWidth>
<InputLabel id="blockchain-select-label">Blockchain</InputLabel>
<Select
label={"Blockchain"}
disabled={availableBlockchains.length <= 1}
labelId="blockchain-select-label"
value={currentBlockchain}
Expand All @@ -257,6 +258,7 @@ const ReceiveScreen: React.FC<DispatchProps & OwnProps & StateProps> = ({
<InputLabel id="coin-select-label">Coin</InputLabel>
<Select
disabled={availableAccepts.length <= 1}
label={"Coin"}
labelId="coin-select-label"
value={
isBitcoinAccept(currentAccept) || currentAccept.contractAddress == null
Expand Down Expand Up @@ -287,6 +289,7 @@ const ReceiveScreen: React.FC<DispatchProps & OwnProps & StateProps> = ({
<Select
disabled={availableAddresses.length <= 1}
labelId="address-select-label"
label={"Address"}
value={currentAddress}
onChange={(event) => setCurrentAddress(event.target.value as string)}
>
Expand Down
2 changes: 1 addition & 1 deletion packages/react-app/src/transaction/SetupTransaction/SetupTransaction.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ export default connect<StateProps, DispatchProps, OwnProps, IState>(

let asset = txStash.selectors.getAsset(state) ?? initialAllowance?.token.address ?? initialAsset ?? coinTicker;

if (!assets.some(({ address, symbol }) => address === asset || symbol === asset)) {
if (assets.length > 0 && !assets.some(({ address, symbol }) => address === asset || symbol === asset)) {
const [{ address, symbol }] = assets;

asset = address ?? symbol;
Expand Down
6 changes: 3 additions & 3 deletions packages/services/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@emeraldwallet/services",
"version": "2.12.0-dev",
"version": "2.12.1",
"main": "lib/index.js",
"types": "lib/index.d.ts",
"author": "Emerald Team",
Expand All @@ -17,8 +17,8 @@
"@emeraldpay/api-node": "^0.5.0",
"@emeraldpay/bigamount": "^0.4.2",
"@emeraldpay/bigamount-crypto": "^0.4.2",
"@emeraldpay/emerald-vault-core": "^0.14.0-dev",
"@emeraldwallet/core": "2.12.0-dev",
"@emeraldpay/emerald-vault-core": "^0.14.0",
"@emeraldwallet/core": "2.12.1",
"@grpc/grpc-js": "^1.8.14",
"ethers": "^6.13.5",
"google-protobuf": "^3.21.2",
Expand Down
6 changes: 3 additions & 3 deletions packages/store/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@emeraldwallet/store",
"version": "2.12.0-dev",
"version": "2.12.1",
"description": "Emerald Redux store",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand All @@ -16,8 +16,8 @@
"dependencies": {
"@emeraldpay/bigamount": "^0.4.2",
"@emeraldpay/bigamount-crypto": "^0.4.2",
"@emeraldpay/emerald-vault-core": "^0.14.0-dev",
"@emeraldwallet/core": "2.12.0-dev",
"@emeraldpay/emerald-vault-core": "^0.14.0",
"@emeraldwallet/core": "2.12.1",
"bignumber.js": "8.0.2",
"color-hash": "^2.0.2",
"immer": "^9.0.21",
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@emeraldwallet/ui",
"version": "2.12.0-dev",
"version": "2.12.1",
"description": "UI components for Emerald Wallet",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand All @@ -18,7 +18,7 @@
"@emeraldpay/bigamount": "^0.4.2",
"@emeraldpay/bigamount-crypto": "^0.4.2",
"@emeraldpay/hashicon": "0.5.1",
"@emeraldwallet/core": "2.12.0-dev",
"@emeraldwallet/core": "2.12.1",
"@fontsource/inter": "^5.0.13",
"@fontsource/roboto-mono": "^5.0.13",
"@mui/icons-material": "5.17.1",
Expand Down
7 changes: 7 additions & 0 deletions packages/ui/src/theme/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,13 @@ export default createTheme({
},
}
},
MuiInputLabel: {
styleOverrides: {
root: {
padding: '0 10px'
}
}
},
MuiInputAdornment: {
styleOverrides: {
root: {
Expand Down
Loading
Loading