Skip to content

Commit

Permalink
chore(wallet-mobile): moving + clean ups
Browse files Browse the repository at this point in the history
  • Loading branch information
stackchain committed May 8, 2024
1 parent e03cc83 commit aa361d1
Show file tree
Hide file tree
Showing 9 changed files with 198 additions and 22 deletions.
8 changes: 4 additions & 4 deletions apps/wallet-mobile/src/NftDetails/NftDetails.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import {storiesOf} from '@storybook/react-native'
import React from 'react'

import {QueryProvider, RouteProvider} from '../../.storybook/decorators'
import {MediaDetails} from '../features/Portfolio/common/MediaDetails/MediaDetails'
import {SelectedWalletProvider} from '../features/WalletManager/Context'
import {mocks, nft} from '../yoroi-wallets/mocks'
import {NftDetails} from './NftDetails'

storiesOf('NFT/Details', module)
.add('Default', () => {
Expand All @@ -17,7 +17,7 @@ storiesOf('NFT/Details', module)
<RouteProvider params={{id: nft.id}}>
<QueryProvider>
<SelectedWalletProvider wallet={loadedWallet}>
<NftDetails />
<MediaDetails />
</SelectedWalletProvider>
</QueryProvider>
</RouteProvider>
Expand All @@ -33,7 +33,7 @@ storiesOf('NFT/Details', module)
<RouteProvider params={{id: nft.id}}>
<QueryProvider>
<SelectedWalletProvider wallet={wallet}>
<NftDetails />
<MediaDetails />
</SelectedWalletProvider>
</QueryProvider>
</RouteProvider>
Expand All @@ -49,7 +49,7 @@ storiesOf('NFT/Details', module)
<RouteProvider params={{id: nft.id}}>
<QueryProvider>
<SelectedWalletProvider wallet={wallet}>
<NftDetails />
<MediaDetails />
</SelectedWalletProvider>
</QueryProvider>
</RouteProvider>
Expand Down
2 changes: 1 addition & 1 deletion apps/wallet-mobile/src/NftDetails/NftDetailsImage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {StyleSheet, useWindowDimensions, View} from 'react-native'
import ViewTransformer from 'react-native-easy-view-transformer'

import {FadeIn} from '../components'
import {MediaPreview} from '../features/Portfolio/common/MediaGallery/MediaPreview'
import {MediaPreview} from '../features/Portfolio/common/MediaPreview/MediaPreview'
import {useSelectedWallet} from '../features/WalletManager/Context'
import {useMetrics} from '../metrics/metricsManager'
import {NftRoutes, useParams} from '../navigation'
Expand Down
4 changes: 2 additions & 2 deletions apps/wallet-mobile/src/Nfts/NftsNavigator.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import {useTheme} from '@yoroi/theme'
import React from 'react'
import {defineMessages, useIntl} from 'react-intl'

import {MediaDetails} from '../features/Portfolio/common/MediaDetails/MediaDetails'
import {useMetrics} from '../metrics/metricsManager'
import {defaultStackNavigationOptions, NftRoutes} from '../navigation'
import {NftDetails} from '../NftDetails/NftDetails'
import {NftDetailsImage} from '../NftDetails/NftDetailsImage'
import {Nfts} from './Nfts'

Expand Down Expand Up @@ -35,7 +35,7 @@ export const NftsNavigator = () => {
headerTitleAlign: 'center',
}}
listeners={trackDetails}
component={NftDetails}
component={MediaDetails}
/>

<Stack.Screen name="nft-image-zoom" options={{headerTitle: () => null}} component={NftDetailsImage} />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ import React, {ReactNode, useState} from 'react'
import {defineMessages, useIntl} from 'react-intl'
import {Linking, SafeAreaView, ScrollView, StyleSheet, TouchableOpacity, useWindowDimensions, View} from 'react-native'

import {CopyButton, FadeIn, Spacer, Text} from '../components'
import {Tab, TabPanel, TabPanels, Tabs} from '../components/Tabs'
import {useExplorers} from '../features/Explorer/common/useExplorers'
import {MediaPreview} from '../features/Portfolio/common/MediaGallery/MediaPreview'
import {useSelectedWallet} from '../features/WalletManager/Context'
import {useMetrics} from '../metrics/metricsManager'
import {NftRoutes} from '../navigation'
import {useNavigateTo} from '../Nfts/navigation'
import {useWalletManager} from '../wallet-manager/WalletManagerContext'

export const NftDetails = () => {
import {CopyButton, FadeIn, Spacer, Text} from '../../../../components'
import {Tab, TabPanel, TabPanels, Tabs} from '../../../../components/Tabs'
import {useMetrics} from '../../../../metrics/metricsManager'
import {NftRoutes} from '../../../../navigation'
import {useNavigateTo} from '../../../../Nfts/navigation'
import {useWalletManager} from '../../../../wallet-manager/WalletManagerContext'
import {useExplorers} from '../../../Explorer/common/useExplorers'
import {useSelectedWallet} from '../../../WalletManager/Context'
import {MediaPreview} from '../MediaPreview/MediaPreview'

export const MediaDetails = () => {
const styles = useStyles()
const strings = useStrings()
const {track} = useMetrics()
Expand Down Expand Up @@ -87,7 +87,6 @@ const Details = ({activeTab, info, network}: DetailsProps) => {
getTokenDiscovery: api.tokenDiscovery,
})

console.log(tokenDiscovery)
// TODO: revisit + product definition (missing is gone state, error state, loading state)
if (!tokenDiscovery) return null

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import React from 'react'
import {StyleSheet, Text, TouchableOpacity, useWindowDimensions, View} from 'react-native'

import {Spacer} from '../../../../components/Spacer/Spacer'
import {MediaPreview} from './MediaPreview'
import {MediaPreview} from '../MediaPreview/MediaPreview'

type Props = {
amounts: ReadonlyArray<Portfolio.Token.Amount>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
"start": {
"line": 47,
"column": 9,
"index": 1342
"index": 1376
},
"end": {
"line": 50,
"column": 3,
"index": 1413
"index": 1447
}
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,167 @@
[
{
"id": "nft.detail.title",
"defaultMessage": "!!!NFT Details",
"file": "src/features/Portfolio/common/MediaDetails/MediaDetails.tsx",
"start": {
"line": 308,
"column": 9,
"index": 8707
},
"end": {
"line": 311,
"column": 3,
"index": 8778
}
},
{
"id": "nft.detail.overview",
"defaultMessage": "!!!Overview",
"file": "src/features/Portfolio/common/MediaDetails/MediaDetails.tsx",
"start": {
"line": 312,
"column": 12,
"index": 8792
},
"end": {
"line": 315,
"column": 3,
"index": 8863
}
},
{
"id": "nft.detail.metadata",
"defaultMessage": "!!!Metadata",
"file": "src/features/Portfolio/common/MediaDetails/MediaDetails.tsx",
"start": {
"line": 316,
"column": 12,
"index": 8877
},
"end": {
"line": 319,
"column": 3,
"index": 8948
}
},
{
"id": "nft.detail.nftName",
"defaultMessage": "!!!NFT Name",
"file": "src/features/Portfolio/common/MediaDetails/MediaDetails.tsx",
"start": {
"line": 320,
"column": 11,
"index": 8961
},
"end": {
"line": 323,
"column": 3,
"index": 9031
}
},
{
"id": "nft.detail.createdAt",
"defaultMessage": "!!!Created",
"file": "src/features/Portfolio/common/MediaDetails/MediaDetails.tsx",
"start": {
"line": 324,
"column": 13,
"index": 9046
},
"end": {
"line": 327,
"column": 3,
"index": 9117
}
},
{
"id": "nft.detail.description",
"defaultMessage": "!!!Description",
"file": "src/features/Portfolio/common/MediaDetails/MediaDetails.tsx",
"start": {
"line": 328,
"column": 15,
"index": 9134
},
"end": {
"line": 331,
"column": 3,
"index": 9211
}
},
{
"id": "nft.detail.author",
"defaultMessage": "!!!Author",
"file": "src/features/Portfolio/common/MediaDetails/MediaDetails.tsx",
"start": {
"line": 332,
"column": 10,
"index": 9223
},
"end": {
"line": 335,
"column": 3,
"index": 9290
}
},
{
"id": "nft.detail.fingerprint",
"defaultMessage": "!!!Fingerprint",
"file": "src/features/Portfolio/common/MediaDetails/MediaDetails.tsx",
"start": {
"line": 336,
"column": 15,
"index": 9307
},
"end": {
"line": 339,
"column": 3,
"index": 9384
}
},
{
"id": "nft.detail.policyId",
"defaultMessage": "!!!Policy id",
"file": "src/features/Portfolio/common/MediaDetails/MediaDetails.tsx",
"start": {
"line": 340,
"column": 12,
"index": 9398
},
"end": {
"line": 343,
"column": 3,
"index": 9470
}
},
{
"id": "nft.detail.detailsLinks",
"defaultMessage": "!!!Details on",
"file": "src/features/Portfolio/common/MediaDetails/MediaDetails.tsx",
"start": {
"line": 344,
"column": 16,
"index": 9488
},
"end": {
"line": 347,
"column": 3,
"index": 9565
}
},
{
"id": "nft.detail.copyMetadata",
"defaultMessage": "!!!Copy metadata",
"file": "src/features/Portfolio/common/MediaDetails/MediaDetails.tsx",
"start": {
"line": 348,
"column": 16,
"index": 9583
},
"end": {
"line": 351,
"column": 3,
"index": 9663
}
}
]
10 changes: 10 additions & 0 deletions packages/common/src/api/getApiError.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,16 @@ describe('getApiError', () => {
throw error
}).toThrow(Api.Errors.InvalidState)
})
it('should throw ResponseMalformed for -3 status', () => {
expect(() => {
const error = getApiError({
status: -3,
message: 'Malformated response',
responseData: null,
})
throw error
}).toThrow(Api.Errors.ResponseMalformed)
})

it('should throw BadRequestError for 400 status', () => {
expect(() => {
Expand Down

0 comments on commit aa361d1

Please sign in to comment.