Skip to content

Commit

Permalink
Merge branch 'master' into 540-add-liquidity-pool-listing-view
Browse files Browse the repository at this point in the history
  • Loading branch information
jp-ryuji committed Nov 30, 2023
2 parents 7409dde + ab147fa commit cb4ee72
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 30 deletions.
28 changes: 0 additions & 28 deletions .eslintrc

This file was deleted.

28 changes: 28 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
module.exports = {
extends: [
'@remix-run/eslint-config',
'@remix-run/eslint-config/jest-testing-library',
'react-app',
'prettier',
],
plugins: ['prettier'],
overrides: [
{
files: ['*.ts', '*.tsx', '*.js'],
parser: '@typescript-eslint/parser',
},
],
rules: {
'react/jsx-wrap-multilines': 'off',
'jsx-a11y/anchor-has-content': 'off',
'comma-dangle': ['warn', 'always-multiline'],
quotes: ['warn', 'single'],
semi: ['warn', 'never'],
'prettier/prettier': [
'error',
{
singleQuote: true,
},
],
},
}
7 changes: 5 additions & 2 deletions app/lib/stellar/server_request_utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import {
tradeRspRecToPropsRec,
transactionRspRecToPropsRec,
} from './server_response_utils'
import { FederationServer, MuxedAccount } from 'stellar-sdk'
import type { Asset, type ServerApi } from 'stellar-sdk'
import type { ServerApi } from 'stellar-sdk'
import { FederationServer, MuxedAccount, NotFoundError } from 'stellar-sdk'
import type { CallBuilder } from 'stellar-sdk/lib/call_builder'
import type { OperationCallBuilder } from 'stellar-sdk/lib/operation_call_builder'
import type { EffectCallBuilder } from 'stellar-sdk/lib/effect_call_builder'
Expand Down Expand Up @@ -126,6 +126,9 @@ const loadAccountByFederatedAddress = (
account: rsp.account,
federatedAddress: address,
}))
.catch((e) => {
throw new NotFoundError(e.message, undefined)
})
}

const loadAccountByMuxedAddress = (server: HorizonServer, address: string) => {
Expand Down

0 comments on commit cb4ee72

Please sign in to comment.