Merge pull request #5588 from EdgeApp/sam/duress-mode-logging

We're not in Kansas anymore

Author: samholmes

src/actions/LogActions.tsx

@@ -235,9 +235,13 @@ function getRepoId(key: string): string {
   return 'Invalid syncKey type'
 }
 
-export const sendLogs = async (logs: LogOutput) => {
+export const sendLogs = async (logs: LogOutput, underDuress: boolean) => {
   console.log('====== SENDING LOGS REQUEST ======')
 
+  if (underDuress) {
+    logs.userMessage += ' (DURESS MODE)'
+  }
+
   return await fetch(logsUri, {
     method: 'PUT',
     headers: {

src/actions/LoginActions.tsx

@@ -57,9 +57,6 @@ function getFirstActiveWalletInfo(account: EdgeAccount): {
 
 export function initializeAccount(navigation: NavigationBase, account: EdgeAccount): ThunkAction<Promise<void>> {
   return async (dispatch, getState) => {
-    if (account.isDuressAccount) logActivity(`pineapple juice`)
-    else logActivity(`Kansas`)
-
     const rootNavigation = getRootNavigation(navigation)
 
     // Log in as quickly as possible, but we do need the sort order:

src/components/modals/LogsModal.tsx

@@ -8,6 +8,7 @@ import { sprintf } from 'sprintf-js'
 import { MultiLogOutput, sendLogs } from '../../actions/LogActions'
 import { lstrings } from '../../locales/strings'
 import { config } from '../../theme/appConfig'
+import { useSelector } from '../../types/reactRedux'
 import { ModalButtons } from '../buttons/ModalButtons'
 import { AlertCardUi4 } from '../cards/AlertCard'
 import { WarningCard } from '../cards/WarningCard'
@@ -26,6 +27,7 @@ export const LogsModal = (props: Props) => {
   const { bridge, logs } = props
   const [userMessage, setUserMessage] = React.useState('')
   const [isKeyboardVisible, setKeyboardVisible] = React.useState(false)
+  const account = useSelector(state => state.core.account)
 
   React.useEffect(() => {
     const keyboardDidShowListener = Keyboard.addListener('keyboardDidShow', () => {
@@ -72,11 +74,13 @@ export const LogsModal = (props: Props) => {
     logs.info.userMessage = userMessage
     logs.activity.userMessage = userMessage
 
+    const underDuress = account.isDuressAccount
+
     await Promise.all([
-      sendLogs(logs.activity).catch((e: any) => {
+      sendLogs(logs.activity, underDuress).catch((e: any) => {
         throw new Error(`${lstrings.settings_modal_send_logs_failure} activity logs code ${e?.message}`)
       }),
-      sendLogs(logs.info).catch((e: any) => {
+      sendLogs(logs.info, underDuress).catch((e: any) => {
         throw new Error(`${lstrings.settings_modal_send_logs_failure} info logs code ${e?.message}`)
       })
     ])