Mirror/robosats
1
0
Fork 0
mirror of https://github.com/RoboSats/robosats.git synced 2025-01-19 04:31:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Android fixed turtle mode (#323)

Browse Source
This commit is contained in:
KoalaSat 2022-11-15 09:27:39 +00:00 committed by GitHub
parent 84997de94f
commit 9f66221273
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,9 +169,13 @@ const EncryptedTurtleChat: React.FC<Props> = ({
apiClient apiClient
.post(baseUrl, `/api/chat`, { .post(baseUrl, `/api/chat`, {
PGP_message: value, PGP_message: value,
offset: lastIndex
}) })
.then((response) => { .then((response) => {
if (response) onMessage(response as ServerMessage); if (response) {
setPeerConnected(response.peer_connected);
setServerMessages(response.messages);
}
}) })
.finally(() => { .finally(() => {
setWaitingEcho(false); setWaitingEcho(false);
@ -188,9 +192,13 @@ const EncryptedTurtleChat: React.FC<Props> = ({
.post(baseUrl, `/api/chat/`, { .post(baseUrl, `/api/chat/`, {
PGP_message: encryptedMessage.toString().split('\n').join('\\'), PGP_message: encryptedMessage.toString().split('\n').join('\\'),
order_id: orderId, order_id: orderId,
offset: lastIndex
}) })
.then((response) => { .then((response) => {
if (response) onMessage(response as ServerMessage); if (response) {
setPeerConnected(response.peer_connected);
setServerMessages(response.messages);
}
}) })
.finally(() => { .finally(() => {
setWaitingEcho(false); setWaitingEcho(false);

4
frontend/src/components/TradeBox/index.js
View File

@ -74,7 +74,7 @@ class TradeBox extends Component {
badInvoice: false, badInvoice: false,
badAddress: false, badAddress: false,
badStatement: false, badStatement: false,
turtleMode: false, turtleMode: window.ReactNativeWebView !== undefined
}; };
} }
@ -1434,6 +1434,7 @@ class TradeBox extends Component {
{/* Make confirmation sound for Chat Open. */} {/* Make confirmation sound for Chat Open. */}
{this.Sound('locked-invoice')} {this.Sound('locked-invoice')}
<Grid item xs={12} align='center'> <Grid item xs={12} align='center'>
{window.ReactNativeWebView === undefined ? (
<div <div
style={{ style={{
display: 'flex', display: 'flex',
@ -1466,6 +1467,7 @@ class TradeBox extends Component {
</div> </div>
</Tooltip> </Tooltip>
</div> </div>
) : <></>}
<Typography variant='subtitle1'> <Typography variant='subtitle1'>
<b> <b>
{' '} {' '}