Skip to content

Commit 2d74e47

Browse files
chaitikachaitika
committed
Merge remote-tracking branch 'upstream/master' into rewrite-e2e-suite
2 parents e7219dc + 284b8e8 commit 2d74e47

122 files changed

Lines changed: 134 additions & 6763 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.env.example‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
INDEXER_BASE_URL=https://your-indexer-url-here/

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
#
33
.DS_Store
44

5+
# Environment variables
6+
.env
7+
58
# Xcode
69
#
710
build/

‎App.tsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,15 @@ import { useLogger } from '@react-navigation/devtools';
1010
import { StorageProvider } from './components/Context/StorageProvider';
1111
import { initializeIndexer } from './modules/SilentPaymentIndexer';
1212
import { initializeRustJsiBridge } from './modules/RustJsiBridge';
13+
import { INDEXER_BASE_URL } from '@env';
1314

1415
const App = () => {
1516
initializeRustJsiBridge();
17+
18+
if (!INDEXER_BASE_URL) throw new Error('INDEXER_BASE_URL is not set');
19+
1620
initializeIndexer({
17-
baseUrl: 'https://superparamount-kendal-halting.ngrok-free.dev/',
21+
baseUrl: INDEXER_BASE_URL,
1822
timeout: 100000, // 100 seconds for blockchain scanning operations (increased for slower connections)
1923
});
2024

‎NavigationService.ts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@ export function reset() {
2323
}
2424
}
2525

26-
export function popToTop() {
27-
if (navigationRef.isReady()) {
28-
navigationRef.current?.dispatch(StackActions.popToTop());
29-
}
30-
}
31-
3226
export function pop() {
3327
if (navigationRef.isReady()) {
3428
navigationRef.current?.dispatch(StackActions.pop());

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ cd silent-pay-wallet
3838
npm install
3939
```
4040

41+
make sure to copy .env.example → .env, set INDEXER_BASE_URL in `.env`, then reset metro cache with `npx react-native start --reset-cache`.
42+
4143
Please make sure that your console is running the most stable versions of npm and node (even-numbered versions).
4244

4345
* To run on Android:

‎ShroudComponents.js‎

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
11
/* eslint react/prop-types: "off", react-native/no-inline-styles: "off" */
22
import React, { forwardRef } from 'react';
3-
import { Dimensions, Platform, Pressable, StyleSheet, TextInput, View } from 'react-native';
4-
import { Icon, Text } from '@rneui/themed';
3+
import { Platform, Pressable, StyleSheet, TextInput, View } from 'react-native';
4+
import { Text } from '@rneui/themed';
55
import { useTheme } from './components/themes';
66

7-
const { height, width } = Dimensions.get('window');
8-
const aspectRatio = height / width;
9-
let isIpad;
10-
if (aspectRatio > 1.6) {
11-
isIpad = false;
12-
} else {
13-
isIpad = true;
14-
}
15-
167
/**
178
* TODO: remove this comment once this file gets properly converted to typescript.
189
*
@@ -102,31 +93,6 @@ export const ShroudFormMultiInput = props => {
10293
);
10394
};
10495

105-
export class is {
106-
static ipad() {
107-
return isIpad;
108-
}
109-
}
110-
111-
export function ShroudBigCheckmark({ style = {} }) {
112-
const defaultStyles = {
113-
backgroundColor: '#ccddf9',
114-
width: 120,
115-
height: 120,
116-
borderRadius: 60,
117-
alignSelf: 'center',
118-
justifyContent: 'center',
119-
marginTop: 0,
120-
marginBottom: 0,
121-
};
122-
const mergedStyles = { ...defaultStyles, ...style };
123-
return (
124-
<View style={mergedStyles}>
125-
<Icon name="check" size={50} type="font-awesome" color="#0f5cc0" />
126-
</View>
127-
);
128-
}
129-
13096
const styles = StyleSheet.create({
13197
shroudButtonLink: {
13298
minWidth: 100,

‎android/app/src/main/AndroidManifest.xml‎

Lines changed: 8 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
1515
<uses-permission android:name="android.permission.USE_BIOMETRIC" />
1616
<uses-permission android:name="android.permission.USE_FINGERPRINT" />
17-
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
1817
<uses-permission android:name="android.permission.VIBRATE" />
1918
<uses-permission android:name="android.permission.DETECT_SCREEN_CAPTURE" />
2019

@@ -32,86 +31,15 @@
3231
android:networkSecurityConfig="@xml/network_security_config"
3332
android:configChanges="uiMode">
3433

35-
<meta-data
36-
android:name="com.dieam.reactnativepushnotification.notification_channel_name"
37-
android:value="Shroud notifications" />
38-
<meta-data
39-
android:name="com.dieam.reactnativepushnotification.notification_channel_description"
40-
android:value="Notifications about incoming payments" />
41-
<meta-data
42-
android:name="com.dieam.reactnativepushnotification.notification_foreground"
43-
android:value="true" />
44-
<meta-data
45-
android:name="com.dieam.reactnativepushnotification.channel_create_default"
46-
android:value="true" />
47-
<meta-data
48-
android:name="com.dieam.reactnativepushnotification.notification_color"
49-
android:resource="@color/white" />
50-
<meta-data
51-
android:name="firebase_messaging_auto_init_enabled"
52-
android:value="false" />
53-
<meta-data
54-
android:name="firebase_analytics_collection_enabled"
55-
android:value="false" />
56-
<provider
57-
android:name="androidx.core.content.FileProvider"
58-
android:authorities="${applicationId}.provider"
59-
android:exported="false"
60-
android:grantUriPermissions="true">
61-
<meta-data
62-
android:name="android.support.FILE_PROVIDER_PATHS"
63-
android:resource="@xml/file_paths" />
64-
</provider>
65-
<receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationActions" />
66-
<receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationPublisher" />
67-
<receiver
68-
android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationBootEventReceiver"
69-
android:exported="true">
70-
<intent-filter>
71-
<action android:name="android.intent.action.BOOT_COMPLETED" />
72-
</intent-filter>
73-
</receiver>
74-
75-
<receiver android:name=".BitcoinPriceWidget" android:exported="true">
76-
<intent-filter>
77-
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
78-
<action android:name="android.intent.action.SCREEN_ON"/>
79-
<action android:name="android.intent.action.SCREEN_OFF"/>
80-
</intent-filter>
34+
<provider
35+
android:name="androidx.core.content.FileProvider"
36+
android:authorities="${applicationId}.provider"
37+
android:exported="false"
38+
android:grantUriPermissions="true">
8139
<meta-data
82-
android:name="android.appwidget.provider"
83-
android:resource="@xml/bitcoin_price_widget_info"/>
84-
</receiver>
85-
86-
<!-- Market Widget -->
87-
<receiver
88-
android:name=".MarketWidget"
89-
android:exported="true">
90-
<intent-filter>
91-
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
92-
</intent-filter>
93-
<meta-data
94-
android:name="android.appwidget.provider"
95-
android:resource="@xml/market_widget_info" />
96-
</receiver>
97-
98-
<!-- Market Widget Configuration Activity -->
99-
<activity
100-
android:name=".MarketWidgetConfigureActivity"
101-
android:exported="true"
102-
android:theme="@style/Theme.AppCompat.Light">
103-
<intent-filter>
104-
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
105-
</intent-filter>
106-
</activity>
107-
108-
<service
109-
android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationListenerService"
110-
android:exported="false">
111-
<intent-filter>
112-
<action android:name="com.google.firebase.MESSAGING_EVENT" />
113-
</intent-filter>
114-
</service>
40+
android:name="android.support.FILE_PROVIDER_PATHS"
41+
android:resource="@xml/file_paths" />
42+
</provider>
11543

11644
<activity
11745
android:name=".MainActivity"

‎android/app/src/main/java/org/bitshala/shroud/AppWidgetUtils.kt‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎android/app/src/main/java/org/bitshala/shroud/BitcoinPriceWidget.kt‎

Lines changed: 0 additions & 130 deletions
This file was deleted.

0 commit comments

Comments
 (0)