Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: remove ST v1 #1748

Merged
merged 2 commits into from
May 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions .env.development.template
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,11 @@ ENABLE_MIGRATION_DEBUG=false
# react-native-ldk JS logs
ENABLE_LDK_LOGS=true

# Backup server (development)
BACKUPS_SHARED_SECRET=6dabb95493023d5c45229331490a9a67fcde2a618798f9dea5c1247eabb13451
BACKUPS_SERVER_SLASHTAG=slash:3phbmj4jkzs7b6e6t1h8jwy1u6o9w9y39nscsc6r1q89t1mxcsuy

# LDK backups
BACKUPS_SERVER_HOST=https://blocktank.synonym.to/staging-backups-ldk
BACKUPS_SERVER_PUBKEY=02c03b8b8c1b5500b622646867d99bf91676fac0f38e2182c91a9ff0d053a21d6d

# Slashtags
DISABLE_SLASHTAGS=false
SLASHTAGS_SEEDER_BASE_URL=https://blocktank.synonym.to
SLASHTAGS_SEEDER_TOPIC=3b9f8ccd062ca9fc0b7dd407b4cd287ca6e2d8b32f046d7958fa7bea4d78fd75
WEB_RELAY=https://webrelay.slashtags.to

# Blocktank
Expand Down
7 changes: 0 additions & 7 deletions .env.test.template
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,11 @@ ENABLE_MIGRATION_DEBUG=false
# react-native-ldk JS logs
ENABLE_LDK_LOGS=false

# Backup server (development)
BACKUPS_SHARED_SECRET=6dabb95493023d5c45229331490a9a67fcde2a618798f9dea5c1247eabb13451
BACKUPS_SERVER_SLASHTAG=slash:3phbmj4jkzs7b6e6t1h8jwy1u6o9w9y39nscsc6r1q89t1mxcsuy

# LDK backups
BACKUPS_SERVER_HOST=http://127.0.0.1:3003
BACKUPS_SERVER_PUBKEY=0319c4ff23820afec0c79ce3a42031d7fef1dff78b7bdd69b5560684f3e1827675

# Slashtags
DISABLE_SLASHTAGS=false
SLASHTAGS_SEEDER_BASE_URL=https://blocktank.synonym.to
SLASHTAGS_SEEDER_TOPIC=3b9f8ccd062ca9fc0b7dd407b4cd287ca6e2d8b32f046d7958fa7bea4d78fd75
WEB_RELAY=https://webrelay.slashtags.to

# Blocktank
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-ios-macmini.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: e2e-ios-macmini
on:
workflow_dispatch:
pull_request:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
Expand Down
1 change: 0 additions & 1 deletion e2e/settings.e2e.js
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,6 @@ d('Settings', () => {
await element(by.id('DevOptions')).multiTap(5); // enable dev mode
}
await element(by.id('DevSettings')).tap();
await expect(element(by.id('SlashtagsSettings'))).toBeVisible();

// Error screen will not be rendered in development mode
if (__DEV__) {
Expand Down
3 changes: 0 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,14 @@
"@synonymdev/react-native-ldk": "0.0.139",
"@synonymdev/react-native-lnurl": "0.0.7",
"@synonymdev/result": "0.0.2",
"@synonymdev/slashtags-auth": "1.0.0-alpha.6",
"@synonymdev/slashtags-keychain": "1.0.0",
"@synonymdev/slashtags-profile": "1.0.2",
"@synonymdev/slashtags-sdk": "1.0.0-alpha.38",
"@synonymdev/slashtags-url": "1.0.1",
"@synonymdev/slashtags-widget-bitcoin-feed": "1.0.0",
"@synonymdev/slashtags-widget-facts-feed": "1.1.0",
"@synonymdev/slashtags-widget-news-feed": "1.1.0",
"@synonymdev/slashtags-widget-price-feed": "1.1.0",
"@synonymdev/web-relay": "1.0.7",
"backpack-client": "github:synonymdev/bitkit-backup-client#f08fdb28529d8a3f8bfecc789443c43b966a7581",
"bech32": "2.0.0",
"beignet": "0.0.37",
"bip21": "2.0.3",
Expand Down
6 changes: 0 additions & 6 deletions src/@types/env.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,9 @@ declare module '@env' {
export const ENABLE_MIGRATION_DEBUG: string;
export const ENABLE_LDK_LOGS: string;

export const BACKUPS_SHARED_SECRET: string;
export const BACKUPS_SERVER_SLASHTAG: string;
export const BACKUPS_SERVER_HOST: string;
export const BACKUPS_SERVER_PUBKEY: string;

export const DISABLE_SLASHTAGS: string;
export const SLASHTAGS_SEEDER_BASE_URL: string;
export const SLASHTAGS_SEEDER_TOPIC: string;

export const BLOCKTANK_HOST: string;

export const ELECTRUM_BITCOIN_HOST: string;
Expand Down
9 changes: 3 additions & 6 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { ThemeProvider } from 'styled-components/native';
import { SafeAreaProvider, StatusBar } from './styles/components';
import { getTheme } from './styles/themes';
import OnboardingNavigator from './navigation/onboarding/OnboardingNavigator';
import { SlashtagsProvider } from './components/SlashtagsProvider';
import { SlashtagsProvider2 } from './components/SlashtagsProvider2';
import { toastConfig } from './components/Toast';
import RecoveryNavigator from './screens/Recovery/RecoveryNavigator';
Expand Down Expand Up @@ -67,11 +66,9 @@ const App = (): ReactElement => {
) : hasCriticalUpdate ? (
<AppUpdate />
) : walletExists ? (
<SlashtagsProvider>
<SlashtagsProvider2>
{requiresRemoteRestore ? <RestoringScreen /> : <AppOnboarded />}
</SlashtagsProvider2>
</SlashtagsProvider>
<SlashtagsProvider2>
{requiresRemoteRestore ? <RestoringScreen /> : <AppOnboarded />}
</SlashtagsProvider2>
) : (
<OnboardingNavigator />
)}
Expand Down
4 changes: 0 additions & 4 deletions src/AppOnboarded.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import InactivityTracker from './components/InactivityTracker';
import { startWalletServices } from './utils/startup';
import { unsubscribeFromLightningSubscriptions } from './utils/lightning';
import { useAppSelector } from './hooks/redux';
import { useMigrateSlashtags2 } from './hooks/slashtags2';
import { dispatch } from './store/helpers';
import { updateUi } from './store/slices/ui';
import { isOnlineSelector } from './store/reselect/ui';
Expand Down Expand Up @@ -41,9 +40,6 @@ const AppOnboarded = (): ReactElement => {
const pinOnLaunch = useAppSelector(pinOnLaunchSelector);
const isOnline = useAppSelector(isOnlineSelector);

// migrate slashtags from v1 to v2
useMigrateSlashtags2();

// on App start
useEffect(() => {
startWalletServices({ selectedNetwork, selectedWallet });
Expand Down
202 changes: 0 additions & 202 deletions src/components/AuthWidget.tsx

This file was deleted.

Loading
Loading