Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Unreleased

- changed: Some unecessary `showError` dropdowns demoted to hidden `showDevError`
- removed: 'fasterpayments' payment type

## 4.12.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { withWallet } from '../../hoc/withWallet'
import { ButtonsModal } from '../../modals/ButtonsModal'
import { WalletListModal, WalletListResult } from '../../modals/WalletListModal'
import { EdgeRow } from '../../rows/EdgeRow'
import { Airship, showError } from '../../services/AirshipInstance'
import { Airship, showDevError, showError } from '../../services/AirshipInstance'
import { cacheStyles, Theme, ThemeProps, withTheme } from '../../services/ThemeContext'
import { EdgeText } from '../../themed/EdgeText'

Expand Down Expand Up @@ -97,8 +97,8 @@ export class FioAddressRegisterSelectWallet extends React.Component<Props, Local
)
this.setState({ activationCost, bitpayUrl, feeValue, supportedAssets: [...supportedAssets, { pluginId: 'fio', tokenId: null }], paymentInfo })
} catch (e: any) {
showError(e)
this.setState({ errorMessage: e.message })
showDevError(String(e))
this.setState({ errorMessage: String(e) })
}
}

Expand Down
8 changes: 3 additions & 5 deletions src/components/scenes/Fio/FioRequestConfirmationScene.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import { AddressModal } from '../../modals/AddressModal'
import { ButtonsModal } from '../../modals/ButtonsModal'
import { TextInputModal } from '../../modals/TextInputModal'
import { EdgeRow } from '../../rows/EdgeRow'
import { Airship, showError, showToast } from '../../services/AirshipInstance'
import { Airship, showDevError, showError, showToast } from '../../services/AirshipInstance'
import { cacheStyles, Theme, ThemeProps, useTheme } from '../../services/ThemeContext'
import { ExchangedFlipInputAmounts } from '../../themed/ExchangedFlipInput2'
import { SceneHeader } from '../../themed/SceneHeader'
Expand Down Expand Up @@ -87,7 +87,7 @@ export class FioRequestConfirmationConnected extends React.Component<Props, Stat
}

componentDidMount() {
this.setAddressesState().catch(err => showError(err))
this.setAddressesState().catch(err => showDevError(err))
}

setAddressesState = async () => {
Expand Down Expand Up @@ -211,9 +211,7 @@ export class FioRequestConfirmationConnected extends React.Component<Props, Stat
} catch (error: any) {
this.setState({ loading: false })
this.resetSlider()
showError(
`${lstrings.fio_request_error_header}. ${error.json && error.json.fields && error.json.fields[0] ? JSON.stringify(error.json.fields[0].error) : ''}`
)
showError(`${lstrings.fio_request_error_header}: "${error.json?.fields?.[0]?.error ?? ''}"`)
}
} else {
showError(lstrings.fio_wallet_missing_for_fio_address)
Expand Down
4 changes: 2 additions & 2 deletions src/components/scenes/LoginScene.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { EdgeSceneProps } from '../../types/routerTypes'
import { logEvent } from '../../util/tracking'
import { DotsBackground } from '../common/DotsBackground'
import { showHelpModal } from '../modals/HelpModal'
import { showError } from '../services/AirshipInstance'
import { showDevError, showError } from '../services/AirshipInstance'
import { LoadingScene } from './LoadingScene'

export interface LoginParams {
Expand Down Expand Up @@ -98,7 +98,7 @@ export function LoginScene(props: Props) {
() => ({
callback() {
Keyboard.dismiss()
showHelpModal(navigation).catch(err => showError(err))
showHelpModal(navigation).catch(err => showDevError(err))
},
text: lstrings.string_help
}),
Expand Down
4 changes: 2 additions & 2 deletions src/components/scenes/SettingsScene.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import { SectionView } from '../layout/SectionView'
import { AutoLogoutModal } from '../modals/AutoLogoutModal'
import { ConfirmContinueModal } from '../modals/ConfirmContinueModal'
import { TextInputModal } from '../modals/TextInputModal'
import { Airship, showError } from '../services/AirshipInstance'
import { Airship, showDevError, showError } from '../services/AirshipInstance'
import { changeTheme, useTheme } from '../services/ThemeContext'
import { SettingsHeaderRow } from '../settings/SettingsHeaderRow'
import { SettingsLabelRow } from '../settings/SettingsLabelRow'
Expand Down Expand Up @@ -204,7 +204,7 @@ export const SettingsScene = (props: Props) => {
await account.deleteRemoteAccount()
await dispatch(logoutRequest(navigation))
await context.forgetAccount(rootLoginId)
Airship.show(bridge => <TextDropdown bridge={bridge} message={sprintf(lstrings.delete_account_feedback, username)} />).catch(err => showError(err))
Airship.show(bridge => <TextDropdown bridge={bridge} message={sprintf(lstrings.delete_account_feedback, username)} />).catch(err => showDevError(err))
return true
}}
/>
Expand Down
4 changes: 2 additions & 2 deletions src/components/scenes/Staking/StakeModifyScene.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import { FlipInputModal2, FlipInputModalResult } from '../../modals/FlipInputMod
import { FlashNotification } from '../../navigation/FlashNotification'
import { FillLoader } from '../../progress-indicators/FillLoader'
import { EdgeRow } from '../../rows/EdgeRow'
import { Airship, showError } from '../../services/AirshipInstance'
import { Airship, showDevError, showError } from '../../services/AirshipInstance'
import { cacheStyles, Theme, useTheme } from '../../services/ThemeContext'
import { Alert } from '../../themed/Alert'
import { EdgeText } from '../../themed/EdgeText'
Expand Down Expand Up @@ -150,7 +150,7 @@ const StakeModifySceneComponent = (props: Props) => {
setErrorMessage(errMessage)
})
.catch(err => {
showError(err)
showDevError(err)
setErrorMessage(errMessage)
})
} else {
Expand Down