diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/ChannelsReadSupport.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/ChannelsReadSupport.java index 80c34b84..35fbfc29 100644 --- a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/ChannelsReadSupport.java +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/ChannelsReadSupport.java @@ -417,7 +417,7 @@ final class ChannelsReadSupport { event.bchName = rs.getString("bch_name"); event.blockNumber = rs.getInt("block_number"); event.blockHash = rs.getBytes("block_hash"); - event.lineStep = (Integer) rs.getObject("this_line_number"); + event.lineStep = null; try { BchBlockEntry entry = new BchBlockEntry(rs.getBytes("block_bytes")); event.createdAtMs = entry.timestamp * 1000L; diff --git a/VERSION.properties b/VERSION.properties index 1a48d601..68cb34db 100644 --- a/VERSION.properties +++ b/VERSION.properties @@ -1,2 +1,2 @@ -client.version=1.4.12 -server.version=1.4.3 +client.version=1.4.13 +server.version=1.4.4 diff --git a/shine-UI/js/services/auth-service.js b/shine-UI/js/services/auth-service.js index eabc5c29..fd1ec31f 100644 --- a/shine-UI/js/services/auth-service.js +++ b/shine-UI/js/services/auth-service.js @@ -2191,9 +2191,11 @@ export class AuthService { if (Number.isFinite(latestBlockNumber) && latestBlockNumber >= 0 && latestBlockHash) { prevLineNumber = latestBlockNumber; prevLineHashHex = latestBlockHash; - thisLineNumber = Number.isFinite(latestLineStep) + thisLineNumber = latest?.kind === 'created' + ? 0 + : Number.isFinite(latestLineStep) ? Math.max(0, latestLineStep + 1) - : Math.max(1, latestBlockNumber === lineCode ? 1 : 0); + : (latestBlockNumber === lineCode ? 0 : 1); } } catch { // fallback to root anchor diff --git a/shine-UI/styles/components.css b/shine-UI/styles/components.css index 3254a030..d4dbfd0c 100644 --- a/shine-UI/styles/components.css +++ b/shine-UI/styles/components.css @@ -4351,17 +4351,17 @@ textarea.input { font-size: 12px; } - .channel-row { - grid-template-columns: 40px minmax(0, 1fr) 64px; +.channel-row { + grid-template-columns: 64px minmax(0, 1fr) 64px; gap: 10px; padding: 12px; } .channel-row .avatar { - width: 38px; - height: 38px; - min-width: 38px; - min-height: 38px; + width: 64px; + height: 64px; + min-width: 64px; + min-height: 64px; } .channel-row-title { @@ -5034,10 +5034,11 @@ textarea.input { } .channel-row .avatar { - width: 44px; - height: 44px; - min-width: 44px; - min-height: 44px; + width: 68px; + height: 68px; + min-width: 68px; + min-height: 68px; + border-radius: 50%; color: #ffffff; font-weight: 700; }