Mirror/robosats
1
0
Fork 0
mirror of https://github.com/RoboSats/robosats.git synced 2024-12-13 19:06:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix connected chat status (#632)

Browse Source
This commit is contained in:
Reckless_Satoshi 2023-05-30 11:38:20 +00:00 committed by GitHub
parent f3a7701166
commit 1e5f7c0715
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/components/Notifications/index.tsx
View File

@ -35,6 +35,7 @@ const path =
window.NativeRobosats === undefined window.NativeRobosats === undefined
? '/static/assets/sounds' ? '/static/assets/sounds'
: 'file:///android_asset/Web.bundle/assets/sounds'; : 'file:///android_asset/Web.bundle/assets/sounds';
const audio = { const audio = {
chat: new Audio(`${path}/chat-open.mp3`), chat: new Audio(`${path}/chat-open.mp3`),
takerFound: new Audio(`${path}/taker-found.mp3`), takerFound: new Audio(`${path}/taker-found.mp3`),

9
frontend/src/components/TradeBox/EncryptedChat/EncryptedSocketChat/index.tsx
View File

@ -16,6 +16,11 @@ import { type EncryptedChatMessage, type ServerMessage } from '..';
import ChatBottom from '../ChatBottom'; import ChatBottom from '../ChatBottom';
import { sha256 } from 'js-sha256'; import { sha256 } from 'js-sha256';
const audioPath =
window.NativeRobosats === undefined
? '/static/assets/sounds'
: 'file:///android_asset/Web.bundle/assets/sounds';
interface Props { interface Props {
orderId: number; orderId: number;
status: number; status: number;
@ -44,7 +49,7 @@ const EncryptedSocketChat: React.FC<Props> = ({
const { t } = useTranslation(); const { t } = useTranslation();
const theme = useTheme(); const theme = useTheme();
const [audio] = useState(() => new Audio(`/static/assets/sounds/chat-open.mp3`)); const [audio] = useState(() => new Audio(`${audioPath}/chat-open.mp3`));
const [connected, setConnected] = useState<boolean>(false); const [connected, setConnected] = useState<boolean>(false);
const [peerConnected, setPeerConnected] = useState<boolean>(false); const [peerConnected, setPeerConnected] = useState<boolean>(false);
const [peerPubKey, setPeerPubKey] = useState<string>(); const [peerPubKey, setPeerPubKey] = useState<string>();
@ -268,7 +273,7 @@ const EncryptedSocketChat: React.FC<Props> = ({
/> />
<Grid item> <Grid item>
<ChatHeader <ChatHeader
connected={connected} connected={connected && (peerPubKey ? true : false)}
peerConnected={peerConnected} peerConnected={peerConnected}
turtleMode={turtleMode} turtleMode={turtleMode}
setTurtleMode={setTurtleMode} setTurtleMode={setTurtleMode}

9
frontend/src/components/TradeBox/EncryptedChat/EncryptedTurtleChat/index.tsx
View File

@ -28,6 +28,11 @@ interface Props {
setTurtleMode: (state: boolean) => void; setTurtleMode: (state: boolean) => void;
} }
const audioPath =
window.NativeRobosats === undefined
? '/static/assets/sounds'
: 'file:///android_asset/Web.bundle/assets/sounds';
const EncryptedTurtleChat: React.FC<Props> = ({ const EncryptedTurtleChat: React.FC<Props> = ({
orderId, orderId,
robot, robot,
@ -43,7 +48,7 @@ const EncryptedTurtleChat: React.FC<Props> = ({
const { t } = useTranslation(); const { t } = useTranslation();
const theme = useTheme(); const theme = useTheme();
const [audio] = useState(() => new Audio(`/static/assets/sounds/chat-open.mp3`)); const [audio] = useState(() => new Audio(`${audioPath}/chat-open.mp3`));
const [peerConnected, setPeerConnected] = useState<boolean>(false); const [peerConnected, setPeerConnected] = useState<boolean>(false);
const [peerPubKey, setPeerPubKey] = useState<string>(); const [peerPubKey, setPeerPubKey] = useState<string>();
const [value, setValue] = useState<string>(''); const [value, setValue] = useState<string>('');
@ -255,7 +260,7 @@ const EncryptedTurtleChat: React.FC<Props> = ({
<Grid item> <Grid item>
<ChatHeader <ChatHeader
connected={true} connected={peerPubKey ? true : false}
peerConnected={peerConnected} peerConnected={peerConnected}
turtleMode={turtleMode} turtleMode={turtleMode}
setTurtleMode={setTurtleMode} setTurtleMode={setTurtleMode}