|
1 | 1 | import { multiply, NFC, Poll, Network, Bitcoin as BitcoinType, Signet as SignetType } from 'libportal-react-native';
|
2 |
| -import { GetStatus } from './types'; // Assuming GetStatus is defined in a separate 'types' file |
| 2 | +import { GetStatus as GetStatusType } from './types'; // Assuming GetStatus is a type or object from the 'types' module |
3 | 3 |
|
4 | 4 | export class Hww {
|
5 | 5 | static multiply(a: number, b: number): Promise<number> {
|
6 | 6 | return multiply(a, b);
|
7 | 7 | }
|
8 | 8 | }
|
9 | 9 |
|
10 |
| -export const poll = { |
| 10 | +// Shared structure for consistency |
| 11 | +const sharedStructure = { |
11 | 12 | poll: Poll,
|
12 | 13 | nfc: NFC,
|
13 | 14 | };
|
14 | 15 |
|
15 |
| -export const newTag = { |
16 |
| - poll: Poll, |
17 |
| - nfc: NFC, |
18 |
| -}; |
| 16 | +export const poll = { ...sharedStructure }; |
19 | 17 |
|
20 |
| -export const IncomingData = { |
21 |
| - poll: Poll, |
22 |
| - nfc: NFC, |
23 |
| -}; |
| 18 | +export const newTag = { ...sharedStructure }; |
| 19 | + |
| 20 | +export const IncomingData = { ...sharedStructure }; |
24 | 21 |
|
25 | 22 | export const GetStatus = {
|
26 |
| - getStatus: GetStatus, // Changed to avoid confusion |
| 23 | + getStatus: GetStatusType, // Using a type-safe alias |
27 | 24 | nfc: NFC,
|
28 | 25 | };
|
29 | 26 |
|
30 | 27 | export const NetworkConfig = {
|
31 |
| - Bitcoin: BitcoinType, // Renamed to avoid conflict with imported Bitcoin |
32 |
| - Signet: SignetType, // Renamed to avoid conflict with imported Signet |
| 28 | + Bitcoin: BitcoinType, // Explicitly distinguish imported Bitcoin |
| 29 | + Signet: SignetType, // Explicitly distinguish imported Signet |
33 | 30 | };
|
34 | 31 |
|
35 |
| -export const GenerateMnemonic = { |
36 |
| - poll: Poll, |
37 |
| - nfc: NFC, |
38 |
| -}; |
| 32 | +export const GenerateMnemonic = { ...sharedStructure }; |
39 | 33 |
|
40 |
| -export const Unlock = { |
41 |
| - poll: Poll, |
42 |
| - nfc: NFC, |
43 |
| -}; |
| 34 | +export const Unlock = { ...sharedStructure }; |
44 | 35 |
|
45 |
| -export const DisplayAddress = { |
46 |
| - poll: Poll, |
47 |
| - nfc: NFC, |
48 |
| -}; |
| 36 | +export const DisplayAddress = { ...sharedStructure }; |
49 | 37 |
|
50 |
| -export const signPSBT = { |
51 |
| - poll: Poll, |
52 |
| - nfc: NFC, |
53 |
| -}; |
| 38 | +export const signPSBT = { ...sharedStructure }; |
| 39 | + |
| 40 | +export const PublicDescriptor = { ...sharedStructure }; |
54 | 41 |
|
55 |
| -export const PublicDescriptor = { |
56 |
| - poll: Poll, |
57 |
| - nfc: NFC, |
58 |
| -}; |
0 commit comments