diff --git a/src/renderer/src/hooks/useSettings.ts b/src/renderer/src/hooks/useSettings.ts index c68873d435..1cd89c45a9 100644 --- a/src/renderer/src/hooks/useSettings.ts +++ b/src/renderer/src/hooks/useSettings.ts @@ -11,7 +11,6 @@ import { setNavbarPosition, setPinTopicsToTop, setSendMessageShortcut as _setSendMessageShortcut, - setShowTokens, setSidebarIcons, setTargetLanguage, setTestChannel as _setTestChannel, @@ -101,9 +100,6 @@ export function useSettings() { setAssistantIconType(assistantIconType: AssistantIconType) { dispatch(setAssistantIconType(assistantIconType)) }, - setShowTokens(showTokens: boolean) { - dispatch(setShowTokens(showTokens)) - }, setDisableHardwareAcceleration(disableHardwareAcceleration: boolean) { dispatch(setDisableHardwareAcceleration(disableHardwareAcceleration)) window.api.setDisableHardwareAcceleration(disableHardwareAcceleration) diff --git a/src/renderer/src/pages/home/Messages/MessageTokens.tsx b/src/renderer/src/pages/home/Messages/MessageTokens.tsx index 6b1eba26fd..8fc370ab94 100644 --- a/src/renderer/src/pages/home/Messages/MessageTokens.tsx +++ b/src/renderer/src/pages/home/Messages/MessageTokens.tsx @@ -1,5 +1,4 @@ // import { useRuntime } from '@renderer/hooks/useRuntime' -import { useSettings } from '@renderer/hooks/useSettings' import { EVENT_NAMES, EventEmitter } from '@renderer/services/EventService' import type { Message } from '@renderer/types/newMessage' import { Popover } from 'antd' @@ -12,7 +11,6 @@ interface MessageTokensProps { } const MessageTokens: React.FC = ({ message }) => { - const { showTokens } = useSettings() // const { generating } = useRuntime() const locateMessage = () => { EventEmitter.emit(EVENT_NAMES.LOCATE_MESSAGE + ':' + message.id, false) @@ -59,7 +57,7 @@ const MessageTokens: React.FC = ({ message }) => { if (message.role === 'user') { return ( - {showTokens && `Tokens: ${message?.usage?.total_tokens}`} + {`Tokens: ${message?.usage?.total_tokens}`} ) } @@ -88,17 +86,15 @@ const MessageTokens: React.FC = ({ message }) => { ) return ( - showTokens && ( - - {hasMetrics ? ( - - {tokensInfo} - - ) : ( - tokensInfo - )} - - ) + + {hasMetrics ? ( + + {tokensInfo} + + ) : ( + tokensInfo + )} + ) } diff --git a/src/renderer/src/store/migrate.ts b/src/renderer/src/store/migrate.ts index 1d8cff52db..8fd80be719 100644 --- a/src/renderer/src/store/migrate.ts +++ b/src/renderer/src/store/migrate.ts @@ -1604,7 +1604,6 @@ const migrateConfig = { if (state.paintings && !state.paintings.tokenflux_paintings) { state.paintings.tokenflux_paintings = [] } - state.settings.showTokens = true state.settings.testPlan = false return state } catch (error) { diff --git a/src/renderer/src/store/settings.ts b/src/renderer/src/store/settings.ts index 446a69ec7f..268f6e14f6 100644 --- a/src/renderer/src/store/settings.ts +++ b/src/renderer/src/store/settings.ts @@ -48,7 +48,6 @@ export interface SettingsState { userName: string userId: string showPrompt: boolean - showTokens: boolean showMessageDivider: boolean messageFont: 'system' | 'serif' showInputEstimatedTokens: boolean @@ -232,7 +231,6 @@ export const initialState: SettingsState = { userName: '', userId: uuid(), showPrompt: true, - showTokens: true, showMessageDivider: true, messageFont: 'system', showInputEstimatedTokens: false, @@ -453,9 +451,6 @@ const settingsSlice = createSlice({ setShowPrompt: (state, action: PayloadAction) => { state.showPrompt = action.payload }, - setShowTokens: (state, action: PayloadAction) => { - state.showTokens = action.payload - }, setShowMessageDivider: (state, action: PayloadAction) => { state.showMessageDivider = action.payload }, @@ -865,7 +860,6 @@ export const { setProxyBypassRules, setUserName, setShowPrompt, - setShowTokens, setShowMessageDivider, setMessageFont, setShowInputEstimatedTokens,