diff --git a/apps/mobile/package.json b/apps/mobile/package.json index d0a32a67..4a7b0310 100644 --- a/apps/mobile/package.json +++ b/apps/mobile/package.json @@ -17,7 +17,7 @@ "eas-build-pre-install": "./eas-hooks/eas-build-pre-install.sh", "format": "prettier --write \"src/**/*.{ts,tsx}\" --ignore-path ../../.prettierignore", "format:check": "prettier --check \"src/**/*.{ts,tsx}\" --ignore-path ../../.prettierignore", - "ios": "expo run:ios --verbose", + "ios": "expo run:ios", "ios:build": "expo run:ios --no-bundler", "lingui": "pnpm lingui:extract && pnpm lingui:compile", "lingui:compile": "lingui compile", diff --git a/apps/mobile/src/app/_layout.tsx b/apps/mobile/src/app/_layout.tsx index 1ac33230..e4473f4f 100644 --- a/apps/mobile/src/app/_layout.tsx +++ b/apps/mobile/src/app/_layout.tsx @@ -1,3 +1,4 @@ +import React from 'react'; import { StatusBar } from 'react-native'; import { GestureHandlerRootView } from 'react-native-gesture-handler'; import { SafeAreaProvider } from 'react-native-safe-area-context'; diff --git a/apps/mobile/src/components/widgets/collectibles/collectibles-widget.tsx b/apps/mobile/src/components/widgets/collectibles/collectibles-widget.tsx index f0347981..65b04298 100644 --- a/apps/mobile/src/components/widgets/collectibles/collectibles-widget.tsx +++ b/apps/mobile/src/components/widgets/collectibles/collectibles-widget.tsx @@ -1,7 +1,6 @@ import React, { useRef } from 'react'; -import { Text } from '@leather.io/ui/native'; -import { CollectibleCard, SheetRef } from '@leather.io/ui/native'; +import { CollectibleCard, SheetRef, Text } from '@leather.io/ui/native'; import { TokenBalance } from '../components/balance/token-balance'; import { CollectiblesHeader } from './collectibles-header'; @@ -29,9 +28,43 @@ export function CollectiblesWidget({ collectibles, totalBalance }: CollectiblesW > {/* Collectibles */} {collectibles.map((collectible: Collectible, index: number) => ( - - {'name' in collectible ? collectible.name : collectible.metadata.name} - + <> + + {'name' in collectible ? collectible.name : collectible.metadata.name} + + + ))} - {/* */} ); } diff --git a/apps/mobile/src/components/widgets/collectibles/collectibles.mocks.d.ts b/apps/mobile/src/components/widgets/collectibles/collectibles.mocks.d.ts deleted file mode 100644 index 997e3771..00000000 --- a/apps/mobile/src/components/widgets/collectibles/collectibles.mocks.d.ts +++ /dev/null @@ -1,46 +0,0 @@ -export declare const mockTotalBalance: { - totalUsdBalance: string; - totalBtcBalance: string; - totalStxBalance: string; -}; -export interface Ordinal { - id: string; - number: number; - output: string; - txid: string; - offset: string; - address: string; - preview: string; - title: string; - genesisBlockHeight: number; - genesisBlockHash: string; - genesisTimestamp: number; - value: string; - mimeType: string; - name: string; - src: string; -} -export interface StacksNft { - token_uri: string; - metadata: { - sip: number; - name: string; - description: string; - image: string; - cached_image: string; - cached_thumbnail_image: string; - attributes?: Array<{ - trait_type: string; - value: string; - display_type?: string; - }>; - properties?: { - collection?: string; - collectionId?: string; - [key: string]: any; - }; - }; -} -export type Collectible = Ordinal | StacksNft; -export declare const mockCollectibles: (Ordinal | StacksNft)[]; -//# sourceMappingURL=collectibles.mocks.d.ts.map \ No newline at end of file diff --git a/apps/mobile/src/components/widgets/collectibles/collectibles.mocks.d.ts.map b/apps/mobile/src/components/widgets/collectibles/collectibles.mocks.d.ts.map deleted file mode 100644 index 9f97a2cc..00000000 --- a/apps/mobile/src/components/widgets/collectibles/collectibles.mocks.d.ts.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"collectibles.mocks.d.ts","sourceRoot":"","sources":["collectibles.mocks.tsx"],"names":[],"mappings":"AAIA,eAAO,MAAM,gBAAgB;;;;CAI5B,CAAC;AAEF,MAAM,WAAW,OAAO;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;CACb;AA2CD,MAAM,WAAW,SAAS;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE;QACR,GAAG,EAAE,MAAM,CAAC;QACZ,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,KAAK,EAAE,MAAM,CAAC;QACd,YAAY,EAAE,MAAM,CAAC;QACrB,sBAAsB,EAAE,MAAM,CAAC;QAC/B,UAAU,CAAC,EAAE,KAAK,CAAC;YACjB,UAAU,EAAE,MAAM,CAAC;YACnB,KAAK,EAAE,MAAM,CAAC;YACd,YAAY,CAAC,EAAE,MAAM,CAAC;SACvB,CAAC,CAAC;QACH,UAAU,CAAC,EAAE;YACX,UAAU,CAAC,EAAE,MAAM,CAAC;YACpB,YAAY,CAAC,EAAE,MAAM,CAAC;YACtB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;SACpB,CAAC;KACH,CAAC;CACH;AAyMD,MAAM,MAAM,WAAW,GAAG,OAAO,GAAG,SAAS,CAAC;AAE9C,eAAO,MAAM,gBAAgB,EAAE,CAAC,OAAO,GAAG,SAAS,CAAC,EAAyC,CAAC"} \ No newline at end of file diff --git a/packages/ui/src/components/collectibles/native/collectible-card.native.tsx b/packages/ui/src/components/collectibles/native/collectible-card.native.tsx index 1d521110..793a1e0d 100644 --- a/packages/ui/src/components/collectibles/native/collectible-card.native.tsx +++ b/packages/ui/src/components/collectibles/native/collectible-card.native.tsx @@ -25,8 +25,7 @@ export function CollectibleCard({ collectible }: CollectibleCardProps) { return ( ); } diff --git a/packages/ui/src/components/collectibles/web/inscription-text.web.tsx b/packages/ui/src/components/collectibles/web/inscription-text.web.tsx index 6a691a08..96d5ceb4 100644 --- a/packages/ui/src/components/collectibles/web/inscription-text.web.tsx +++ b/packages/ui/src/components/collectibles/web/inscription-text.web.tsx @@ -29,5 +29,3 @@ export function InscriptionTextLayout({ content }: InscriptionTextLayoutProps) { ); } - -// PETE check this as this had Query too :( need to pass in jsonParsecontent