Merge branch 'feat/2722-ne-ui' into release/v1.1.5

CHANGELOG.md

@@ -6,12 +6,6 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 
 ### Added
 
-### Changed
-
-## [v1.1.5] (2023-01-10)
-
-### Added
-
 - socks5: send status message for service ready, and network-requester error response in https://github.com/nymtech/nym/pull/2715
 
 ### Changed

Cargo.lock

@@ -660,7 +660,7 @@ dependencies = [
 
 [[package]]
 name = "client-core"
-version = "1.1.5"
+version = "1.1.4"
 dependencies = [
  "async-trait",
  "client-connections",
@@ -1762,7 +1762,7 @@ dependencies = [
 
 [[package]]
 name = "explorer-api"
-version = "1.1.2"
+version = "1.1.1"
 dependencies = [
  "chrono",
  "clap 3.2.8",
@@ -3234,7 +3234,7 @@ dependencies = [
 
 [[package]]
 name = "nym-cli"
-version = "1.1.5"
+version = "1.1.4"
 dependencies = [
  "anyhow",
  "base64",
@@ -3288,7 +3288,7 @@ dependencies = [
 
 [[package]]
 name = "nym-client"
-version = "1.1.5"
+version = "1.1.4"
 dependencies = [
  "clap 3.2.8",
  "client-connections",
@@ -3327,7 +3327,7 @@ dependencies = [
 
 [[package]]
 name = "nym-gateway"
-version = "1.1.5"
+version = "1.1.4"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3374,7 +3374,7 @@ dependencies = [
 
 [[package]]
 name = "nym-mixnode"
-version = "1.1.5"
+version = "1.1.4"
 dependencies = [
  "anyhow",
  "bs58",
@@ -3416,7 +3416,7 @@ dependencies = [
 
 [[package]]
 name = "nym-network-requester"
-version = "1.1.5"
+version = "1.1.4"
 dependencies = [
  "async-trait",
  "clap 3.2.8",
@@ -3448,7 +3448,7 @@ dependencies = [
 
 [[package]]
 name = "nym-network-statistics"
-version = "1.1.5"
+version = "1.1.4"
 dependencies = [
  "dirs",
  "log",
@@ -3480,7 +3480,7 @@ dependencies = [
 
 [[package]]
 name = "nym-socks5-client"
-version = "1.1.5"
+version = "1.1.4"
 dependencies = [
  "clap 3.2.8",
  "client-connections",
@@ -3547,7 +3547,7 @@ dependencies = [
 
 [[package]]
 name = "nym-validator-api"
-version = "1.1.5"
+version = "1.1.4"
 dependencies = [
  "anyhow",
  "async-trait",

explorer/src/components/TableToolbar.tsx

@@ -4,6 +4,8 @@ import Select, { SelectChangeEvent } from '@mui/material/Select';
 import { Filters } from './Filters/Filters';
 import { useIsMobile } from '../hooks/useIsMobile';
 
+const fieldsHeight = '42.25px';
+
 type TableToolBarProps = {
   onChangeSearch: (arg: string) => void;
   onChangePageSize: (event: SelectChangeEvent<string>) => void;
@@ -35,7 +37,7 @@ export const TableToolbar: React.FC<TableToolBarProps> = ({
       }}
     >
       <Box sx={{ display: 'flex', flexDirection: isMobile ? 'column-reverse' : 'row', alignItems: 'middle' }}>
-        <Box sx={{ display: 'flex', justifyContent: 'space-between' }}>
+        <Box sx={{ display: 'flex', justifyContent: 'space-between', height: fieldsHeight }}>
           {childrenBefore}
           <Select
             labelId="simple-select-label"
@@ -65,6 +67,9 @@ export const TableToolbar: React.FC<TableToolBarProps> = ({
           sx={{
             width: isMobile ? '100%' : 200,
             marginBottom: isMobile ? 2 : 0,
+            '& > :not(style)': {
+              height: fieldsHeight,
+            },
           }}
           value={searchTerm}
           data-testid="search-box"

nym-wallet/CHANGELOG.md

@@ -12,10 +12,6 @@
 
 This release contains the APY calculator feature.
 
-## [nym-wallet-v1.1.5](https://github.com/nymtech/nym/releases/tag/nym-wallet-v1.1.5) (2022-12-22)
-
-This release contains the APY calculator feature.
-
 ## [nym-wallet-v1.1.4](https://github.com/nymtech/nym/releases/tag/nym-wallet-v1.1.4) (2022-12-20)
 
 This release contains a bugfix for hiding and displaying the mnemonic, and displays the Bity wallet address in the buy page, as well as better error handling. 

nym-wallet/Cargo.lock

@@ -2876,7 +2876,7 @@ dependencies = [
 
 [[package]]
 name = "nym_wallet"
-version = "1.1.6"
+version = "1.1.5"
 dependencies = [
  "aes-gcm",
  "argon2 0.3.4",