From 3107eb577bb616d1efbf0a9b1d0a57ae31031a53 Mon Sep 17 00:00:00 2001
From: Jason <jayvdb1@gmail.com>
Date: Thu, 5 Sep 2024 13:16:48 +0200
Subject: [PATCH 01/10] fix: stop auto removing peers

---
 src/screens/Settings/Lightning/Channels.tsx | 24 +++++++++++++++++++++
 src/utils/lightning/index.ts                |  9 ++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/screens/Settings/Lightning/Channels.tsx b/src/screens/Settings/Lightning/Channels.tsx
index 5fd2df989..56bc659c7 100644
--- a/src/screens/Settings/Lightning/Channels.tsx
+++ b/src/screens/Settings/Lightning/Channels.tsx
@@ -45,6 +45,7 @@ import {
 	recoverOutputsFromForceClose,
 	refreshLdk,
 	setupLdk,
+	removeUnusedPeers,
 } from '../../../utils/lightning';
 import { showToast } from '../../../utils/notifications';
 import {
@@ -349,6 +350,23 @@ const Channels = ({
 		});
 	}, [peer, selectedNetwork, selectedWallet, t]);
 
+	const onRemoveUnusedPeers = useCallback(async () => {
+		const res = await removeUnusedPeers({ selectedWallet, selectedNetwork });
+		if (res.isErr()) {
+			showToast({
+				type: 'warning',
+				title: 'No unused peers removed',
+				description: res.error.message,
+			});
+		} else {
+			showToast({
+				type: 'info',
+				title: 'Removed unused peers',
+				description: res.value,
+			});
+		}
+	}, [selectedNetwork, selectedWallet]);
+
 	return (
 		<ThemedView style={styles.root}>
 			<SafeAreaInset type="top" />
@@ -487,6 +505,12 @@ const Channels = ({
 							onPress={onAddPeer}
 							testID="AddPeerButton"
 						/>
+						<Button
+							style={styles.devButton}
+							text={'Remove unused peers'}
+							onPress={onRemoveUnusedPeers}
+							testID="AddPeerButton"
+						/>
 						<Button
 							style={styles.devButton}
 							text="Refresh LDK"
diff --git a/src/utils/lightning/index.ts b/src/utils/lightning/index.ts
index 673d3fcad..df088c3ee 100644
--- a/src/utils/lightning/index.ts
+++ b/src/utils/lightning/index.ts
@@ -335,7 +335,6 @@ export const setupLdk = async ({
 		await Promise.all([
 			updateLightningNodeIdThunk(),
 			updateLightningNodeVersionThunk(),
-			removeUnusedPeers({ selectedWallet, selectedNetwork }),
 			addTrustedPeers(),
 		]);
 		if (shouldRefreshLdk) {
@@ -1575,6 +1574,8 @@ export const removeUnusedPeers = async ({
 	const blocktankPubKeys = blocktankInfo.nodes.map((n) => n.pubkey);
 	const peers = await lm.getPeers();
 
+	let removedCount = 0;
+
 	await Promise.all(
 		peers.map((peer) => {
 			if (
@@ -1591,10 +1592,14 @@ export const removeUnusedPeers = async ({
 					address: peer.address,
 					port: peer.port,
 				}).then();
+
+				removedCount++;
+
+				console.error(`Removed unused peer: ${peerStr}`);
 			}
 		}),
 	);
-	return ok('Unused peers removed.');
+	return ok(`${removedCount} unused peers removed.`);
 };
 
 /**

From 7a4e369c4240626e00c7757ea98af9e24d29109d Mon Sep 17 00:00:00 2001
From: Ivan Vershigora <ivan.vershigora@gmail.com>
Date: Thu, 5 Sep 2024 13:33:12 +0100
Subject: [PATCH 02/10] fix: remove duplicate TestID AddPeerButton

---
 src/screens/Settings/Lightning/Channels.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/screens/Settings/Lightning/Channels.tsx b/src/screens/Settings/Lightning/Channels.tsx
index 56bc659c7..27e21fe11 100644
--- a/src/screens/Settings/Lightning/Channels.tsx
+++ b/src/screens/Settings/Lightning/Channels.tsx
@@ -507,9 +507,8 @@ const Channels = ({
 						/>
 						<Button
 							style={styles.devButton}
-							text={'Remove unused peers'}
+							text="Remove unused peers"
 							onPress={onRemoveUnusedPeers}
-							testID="AddPeerButton"
 						/>
 						<Button
 							style={styles.devButton}

From bd70be6dbc723ba6b34ea11de7fb1a372e35ae6c Mon Sep 17 00:00:00 2001
From: Ivan Vershigora <ivan.vershigora@gmail.com>
Date: Tue, 9 Jul 2024 12:55:34 +0100
Subject: [PATCH 03/10] fix: test channel.is_usable in e2e/lightning

---
 e2e/lightning.e2e.js                              | 2 ++
 src/screens/Settings/Lightning/ChannelDetails.tsx | 1 +
 2 files changed, 3 insertions(+)

diff --git a/e2e/lightning.e2e.js b/e2e/lightning.e2e.js
index ce978bd05..6d18bbbd0 100644
--- a/e2e/lightning.e2e.js
+++ b/e2e/lightning.e2e.js
@@ -151,6 +151,7 @@ d('Lightning', () => {
 				element(by.id('MoneyText').withAncestor(by.id('TotalSize'))),
 			).toHaveText('100 000');
 			await element(by.id('ChannelScrollView')).scrollTo('bottom', NaN, 0.1);
+			await expect(element(by.id('IsUsableYes'))).toBeVisible();
 			await element(by.id('NavigationClose')).atIndex(0).tap();
 
 			await sleep(500);
@@ -409,6 +410,7 @@ d('Lightning', () => {
 			await element(by.id('Channels')).tap();
 			await element(by.id('Channel')).atIndex(0).tap();
 			await element(by.id('ChannelScrollView')).scrollTo('bottom', NaN, 0.1);
+			await expect(element(by.id('IsUsableYes'))).toBeVisible();
 
 			// close channel
 			await element(by.id('CloseConnection')).tap();
diff --git a/src/screens/Settings/Lightning/ChannelDetails.tsx b/src/screens/Settings/Lightning/ChannelDetails.tsx
index 25a2d9024..35b4f6b05 100644
--- a/src/screens/Settings/Lightning/ChannelDetails.tsx
+++ b/src/screens/Settings/Lightning/ChannelDetails.tsx
@@ -454,6 +454,7 @@ const ChannelDetails = ({
 					</View>
 					<Section
 						name={t('is_usable')}
+						testID={channel.is_usable ? 'IsUsableYes' : 'IsUsableNo'}
 						value={
 							<CaptionB>{t(channel.is_usable ? t('yes') : t('no'))}</CaptionB>
 						}

From 00dc9923e9104cb60647178180739f0f350f94d0 Mon Sep 17 00:00:00 2001
From: Ivan Vershigora <ivan.vershigora@gmail.com>
Date: Tue, 9 Jul 2024 15:01:25 +0100
Subject: [PATCH 04/10] fix: bump synonymsoft/ldk-backup-server:0.0.146

---
 docker/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 1f87892b9..eb29ae547 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -122,7 +122,7 @@ services:
 
   ldk-backup-server:
     container_name: ldk-backup-server
-    image: synonymsoft/ldk-backup-server:latest
+    image: synonymsoft/ldk-backup-server:0.0.146
     expose:
       - '3003'
     ports:

From 05ada48445dbba51e01cb31095ccb7499d469d48 Mon Sep 17 00:00:00 2001
From: Jason <jayvdb1@gmail.com>
Date: Thu, 5 Sep 2024 19:56:49 +0200
Subject: [PATCH 05/10] fix: connect to previously persisted peers

---
 src/utils/lightning/index.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/utils/lightning/index.ts b/src/utils/lightning/index.ts
index df088c3ee..11e75b37c 100644
--- a/src/utils/lightning/index.ts
+++ b/src/utils/lightning/index.ts
@@ -1115,6 +1115,9 @@ export const addPeers = async ({
 	selectedNetwork?: EAvailableNetwork;
 } = {}): Promise<Result<string[]>> => {
 	try {
+		//Connect to any existing persisted peers.
+		await lm.addPeers();
+
 		const geoBlocked = await isGeoBlocked(true);
 
 		let blocktankNodeUris: string[] = [];
@@ -1140,6 +1143,7 @@ export const addPeers = async ({
 			...blocktankLightningPeers,
 			...customLightningPeers,
 		];
+
 		const addPeerRes = await Promise.all(
 			peers.map(async (peer) => {
 				const addPeerResponse = await addPeer({
@@ -1594,8 +1598,6 @@ export const removeUnusedPeers = async ({
 				}).then();
 
 				removedCount++;
-
-				console.error(`Removed unused peer: ${peerStr}`);
 			}
 		}),
 	);

From 3745f1d26bf1485dd0fde230e6cd84b059629cd7 Mon Sep 17 00:00:00 2001
From: Philipp Walter <philippwalter@proton.me>
Date: Fri, 6 Sep 2024 16:11:43 +0200
Subject: [PATCH 06/10] fix(ui): remove exit app buttons (#2206)

---
 e2e/settings.e2e.js                  |   1 -
 ios/Podfile.lock                     |   6 --
 ios/bitkit.xcodeproj/project.pbxproj | 108 +++++++++++++--------------
 package.json                         |   1 -
 src/screens/AppError.tsx             |  16 ----
 src/screens/Recovery/Recovery.tsx    |  17 -----
 yarn.lock                            |   8 --
 7 files changed, 54 insertions(+), 103 deletions(-)

diff --git a/e2e/settings.e2e.js b/e2e/settings.e2e.js
index 1f0782e17..f1b42e6f8 100644
--- a/e2e/settings.e2e.js
+++ b/e2e/settings.e2e.js
@@ -640,7 +640,6 @@ d('Settings', () => {
 			}
 
 			await element(by.id('TriggerRenderError')).tap();
-			await expect(element(by.id('ErrorClose'))).toBeVisible();
 			await expect(element(by.id('ErrorReport'))).toBeVisible();
 
 			markComplete('settings-dev');
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 2165e9ae0..2710f7c72 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1365,8 +1365,6 @@ PODS:
     - React-Core
   - RNDeviceInfo (11.1.0):
     - React-Core
-  - RNExitApp (2.0.0):
-    - React-Core
   - RNFS (2.20.0):
     - React-Core
   - RNGestureHandler (2.15.0):
@@ -1565,7 +1563,6 @@ DEPENDENCIES:
   - ReactNativeCameraKit (from `../node_modules/react-native-camera-kit`)
   - "RNCClipboard (from `../node_modules/@react-native-clipboard/clipboard`)"
   - RNDeviceInfo (from `../node_modules/react-native-device-info`)
-  - RNExitApp (from `../node_modules/react-native-exit-app`)
   - RNFS (from `../node_modules/react-native-fs`)
   - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
   - "RNKeychain (from `../node_modules/@synonymdev/react-native-keychain`)"
@@ -1738,8 +1735,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/@react-native-clipboard/clipboard"
   RNDeviceInfo:
     :path: "../node_modules/react-native-device-info"
-  RNExitApp:
-    :path: "../node_modules/react-native-exit-app"
   RNFS:
     :path: "../node_modules/react-native-fs"
   RNGestureHandler:
@@ -1850,7 +1845,6 @@ SPEC CHECKSUMS:
   ReactNativeCameraKit: 71343efc1256720184ce980f164c7eedb78d5c16
   RNCClipboard: 0a720adef5ec193aa0e3de24c3977222c7e52a37
   RNDeviceInfo: b899ce37a403a4dea52b7cb85e16e49c04a5b88e
-  RNExitApp: 00036cabe7bacbb413d276d5520bf74ba39afa6a
   RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
   RNGestureHandler: 9b113eb9b7a4cbe66e1dbf4d9914281863ee0703
   RNKeychain: 35f92386e7f8548e3e60e7441121afbe8c62d8e4
diff --git a/ios/bitkit.xcodeproj/project.pbxproj b/ios/bitkit.xcodeproj/project.pbxproj
index dc70cd51b..bc7f8b426 100644
--- a/ios/bitkit.xcodeproj/project.pbxproj
+++ b/ios/bitkit.xcodeproj/project.pbxproj
@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		00E356F31AD99517003FC87E /* bitkitTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* bitkitTests.m */; };
+		124B0F9DDF6319E7A2B43B63 /* libPods-bitkit-bitkitTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E62DF1EACA6341AC3274733 /* libPods-bitkit-bitkitTests.a */; };
 		13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
@@ -15,13 +16,12 @@
 		57072143CA0F49089AE64F61 /* InterTight-ExtraBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A223BA795CEB4CB2B344FBAF /* InterTight-ExtraBold.ttf */; };
 		6980B602E6DC4429841BE5EE /* InterTight-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D67AECF5F543462F90EC89AD /* InterTight-Medium.ttf */; };
 		81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
+		85B0E80EE757966B8D4672F7 /* libPods-bitkit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F387923D0972B668CCE11B46 /* libPods-bitkit.a */; };
 		8BD8301E3A1B44DDA3C8A10D /* Damion-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DEC74C5375A34FFCAEBA0781 /* Damion-Regular.ttf */; };
 		925570EA7B1D43CC8AD07B91 /* InterTight-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = CA37793F82F144678099A00D /* InterTight-Bold.ttf */; };
 		9952E811473D46FB9003A56D /* InterTight-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 50A8DA09F2974D05A3C58E87 /* InterTight-SemiBold.ttf */; };
 		B3BE07A9843E4B7DA375B877 /* InterTight-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 79DFAC55B0D745DE815EC2E0 /* InterTight-Regular.ttf */; };
-		BBC9731B7D9C72548BC42C35 /* libPods-bitkit-bitkitTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4072CF178C6811C27BE16827 /* libPods-bitkit-bitkitTests.a */; };
 		E2F35FC226645CE623C61C03 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 919FE2A2B4A7605C9F606896 /* PrivacyInfo.xcprivacy */; };
-		EC34482BDFFC55206077E800 /* libPods-bitkit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C50DD6D0434692E5BE5C1C3 /* libPods-bitkit.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -45,22 +45,22 @@
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = bitkit/Info.plist; sourceTree = "<group>"; };
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = bitkit/main.m; sourceTree = "<group>"; };
 		13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = PrivacyInfo.xcprivacy; path = bitkit/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
+		25219B5606FB907D158A4444 /* Pods-bitkit-bitkitTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bitkit-bitkitTests.release.xcconfig"; path = "Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests.release.xcconfig"; sourceTree = "<group>"; };
 		3815D562618543E7A9BC191E /* InterTight-Black.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "InterTight-Black.ttf"; path = "../src/assets/fonts/InterTight-Black.ttf"; sourceTree = "<group>"; };
-		3BE44ABA44F8D883E8738357 /* Pods-bitkit.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bitkit.debug.xcconfig"; path = "Target Support Files/Pods-bitkit/Pods-bitkit.debug.xcconfig"; sourceTree = "<group>"; };
-		3C50DD6D0434692E5BE5C1C3 /* libPods-bitkit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-bitkit.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		4072CF178C6811C27BE16827 /* libPods-bitkit-bitkitTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-bitkit-bitkitTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		3B63A2DDCD9A4BC13D8C7C78 /* Pods-bitkit-bitkitTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bitkit-bitkitTests.debug.xcconfig"; path = "Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests.debug.xcconfig"; sourceTree = "<group>"; };
+		3E62DF1EACA6341AC3274733 /* libPods-bitkit-bitkitTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-bitkit-bitkitTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		50A8DA09F2974D05A3C58E87 /* InterTight-SemiBold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "InterTight-SemiBold.ttf"; path = "../src/assets/fonts/InterTight-SemiBold.ttf"; sourceTree = "<group>"; };
 		79DFAC55B0D745DE815EC2E0 /* InterTight-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "InterTight-Regular.ttf"; path = "../src/assets/fonts/InterTight-Regular.ttf"; sourceTree = "<group>"; };
-		81767485E82F0D9B4AB722B5 /* Pods-bitkit-bitkitTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bitkit-bitkitTests.debug.xcconfig"; path = "Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests.debug.xcconfig"; sourceTree = "<group>"; };
 		81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = bitkit/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		919FE2A2B4A7605C9F606896 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = bitkit/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
+		9C3806FEE36A597CF881ABF5 /* Pods-bitkit.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bitkit.release.xcconfig"; path = "Target Support Files/Pods-bitkit/Pods-bitkit.release.xcconfig"; sourceTree = "<group>"; };
 		A223BA795CEB4CB2B344FBAF /* InterTight-ExtraBold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "InterTight-ExtraBold.ttf"; path = "../src/assets/fonts/InterTight-ExtraBold.ttf"; sourceTree = "<group>"; };
-		B280297988208E1BF1BC559F /* Pods-bitkit.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bitkit.release.xcconfig"; path = "Target Support Files/Pods-bitkit/Pods-bitkit.release.xcconfig"; sourceTree = "<group>"; };
-		C520B2A69FF77BE430CF7DDF /* Pods-bitkit-bitkitTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bitkit-bitkitTests.release.xcconfig"; path = "Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests.release.xcconfig"; sourceTree = "<group>"; };
 		CA37793F82F144678099A00D /* InterTight-Bold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "InterTight-Bold.ttf"; path = "../src/assets/fonts/InterTight-Bold.ttf"; sourceTree = "<group>"; };
 		D67AECF5F543462F90EC89AD /* InterTight-Medium.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "InterTight-Medium.ttf"; path = "../src/assets/fonts/InterTight-Medium.ttf"; sourceTree = "<group>"; };
 		DEC74C5375A34FFCAEBA0781 /* Damion-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Damion-Regular.ttf"; path = "../src/assets/fonts/Damion-Regular.ttf"; sourceTree = "<group>"; };
+		E2B4827AFFBF565147F51613 /* Pods-bitkit.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bitkit.debug.xcconfig"; path = "Target Support Files/Pods-bitkit/Pods-bitkit.debug.xcconfig"; sourceTree = "<group>"; };
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
+		F387923D0972B668CCE11B46 /* libPods-bitkit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-bitkit.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -68,7 +68,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BBC9731B7D9C72548BC42C35 /* libPods-bitkit-bitkitTests.a in Frameworks */,
+				124B0F9DDF6319E7A2B43B63 /* libPods-bitkit-bitkitTests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -76,7 +76,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				EC34482BDFFC55206077E800 /* libPods-bitkit.a in Frameworks */,
+				85B0E80EE757966B8D4672F7 /* libPods-bitkit.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -119,8 +119,8 @@
 			isa = PBXGroup;
 			children = (
 				ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
-				3C50DD6D0434692E5BE5C1C3 /* libPods-bitkit.a */,
-				4072CF178C6811C27BE16827 /* libPods-bitkit-bitkitTests.a */,
+				F387923D0972B668CCE11B46 /* libPods-bitkit.a */,
+				3E62DF1EACA6341AC3274733 /* libPods-bitkit-bitkitTests.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -183,10 +183,10 @@
 		BBD78D7AC51CEA395F1C20DB /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				3BE44ABA44F8D883E8738357 /* Pods-bitkit.debug.xcconfig */,
-				B280297988208E1BF1BC559F /* Pods-bitkit.release.xcconfig */,
-				81767485E82F0D9B4AB722B5 /* Pods-bitkit-bitkitTests.debug.xcconfig */,
-				C520B2A69FF77BE430CF7DDF /* Pods-bitkit-bitkitTests.release.xcconfig */,
+				E2B4827AFFBF565147F51613 /* Pods-bitkit.debug.xcconfig */,
+				9C3806FEE36A597CF881ABF5 /* Pods-bitkit.release.xcconfig */,
+				3B63A2DDCD9A4BC13D8C7C78 /* Pods-bitkit-bitkitTests.debug.xcconfig */,
+				25219B5606FB907D158A4444 /* Pods-bitkit-bitkitTests.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -198,12 +198,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "bitkitTests" */;
 			buildPhases = (
-				036518138E8B9496A4E853D6 /* [CP] Check Pods Manifest.lock */,
+				63A2B0D1433274FD5C105FCE /* [CP] Check Pods Manifest.lock */,
 				00E356EA1AD99517003FC87E /* Sources */,
 				00E356EB1AD99517003FC87E /* Frameworks */,
 				00E356EC1AD99517003FC87E /* Resources */,
-				433CF9245DE964ABD00FB429 /* [CP] Embed Pods Frameworks */,
-				CD19A7BBB54C823D36FA61A4 /* [CP] Copy Pods Resources */,
+				4BD74F613A88E196BA251ED6 /* [CP] Embed Pods Frameworks */,
+				0BAC1EB73F07D919FF626823 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -219,13 +219,13 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "bitkit" */;
 			buildPhases = (
-				72FFE2E54300E29A43887CF2 /* [CP] Check Pods Manifest.lock */,
+				ACC2357292E3721C62513819 /* [CP] Check Pods Manifest.lock */,
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
-				2E3D61DA626340982B5869C7 /* [CP] Embed Pods Frameworks */,
-				B5432C25295F0048C514F7C0 /* [CP] Copy Pods Resources */,
+				C2A0B633861DD92ABB0F7903 /* [CP] Embed Pods Frameworks */,
+				3133EC31E0DF08FC6B58847F /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -316,46 +316,41 @@
 			shellPath = /bin/sh;
 			shellScript = "set -e\n\nWITH_ENVIRONMENT=\"$REACT_NATIVE_PATH/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"$REACT_NATIVE_PATH/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n";
 		};
-		036518138E8B9496A4E853D6 /* [CP] Check Pods Manifest.lock */ = {
+		0BAC1EB73F07D919FF626823 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
+			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-bitkit-bitkitTests-checkManifestLockResult.txt",
+				"${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		2E3D61DA626340982B5869C7 /* [CP] Embed Pods Frameworks */ = {
+		3133EC31E0DF08FC6B58847F /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+				"${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			name = "[CP] Embed Pods Frameworks";
+			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+				"${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		433CF9245DE964ABD00FB429 /* [CP] Embed Pods Frameworks */ = {
+		4BD74F613A88E196BA251ED6 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -372,7 +367,7 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		72FFE2E54300E29A43887CF2 /* [CP] Check Pods Manifest.lock */ = {
+		63A2B0D1433274FD5C105FCE /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -387,45 +382,50 @@
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-bitkit-checkManifestLockResult.txt",
+				"$(DERIVED_FILE_DIR)/Pods-bitkit-bitkitTests-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		B5432C25295F0048C514F7C0 /* [CP] Copy Pods Resources */ = {
+		ACC2357292E3721C62513819 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			name = "[CP] Copy Pods Resources";
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
 			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-bitkit-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-resources.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		CD19A7BBB54C823D36FA61A4 /* [CP] Copy Pods Resources */ = {
+		C2A0B633861DD92ABB0F7903 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-resources-${CONFIGURATION}-input-files.xcfilelist",
+				"${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			name = "[CP] Copy Pods Resources";
+			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-resources-${CONFIGURATION}-output-files.xcfilelist",
+				"${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -461,7 +461,7 @@
 /* Begin XCBuildConfiguration section */
 		00E356F61AD99517003FC87E /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 81767485E82F0D9B4AB722B5 /* Pods-bitkit-bitkitTests.debug.xcconfig */;
+			baseConfigurationReference = 3B63A2DDCD9A4BC13D8C7C78 /* Pods-bitkit-bitkitTests.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
@@ -489,7 +489,7 @@
 		};
 		00E356F71AD99517003FC87E /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = C520B2A69FF77BE430CF7DDF /* Pods-bitkit-bitkitTests.release.xcconfig */;
+			baseConfigurationReference = 25219B5606FB907D158A4444 /* Pods-bitkit-bitkitTests.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
@@ -514,7 +514,7 @@
 		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 3BE44ABA44F8D883E8738357 /* Pods-bitkit.debug.xcconfig */;
+			baseConfigurationReference = E2B4827AFFBF565147F51613 /* Pods-bitkit.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconOrange;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
@@ -546,7 +546,7 @@
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = B280297988208E1BF1BC559F /* Pods-bitkit.release.xcconfig */;
+			baseConfigurationReference = 9C3806FEE36A597CF881ABF5 /* Pods-bitkit.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconOrange;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
diff --git a/package.json b/package.json
index 296bcfabd..3e32ea844 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,6 @@
     "react-native-device-info": "11.1.0",
     "react-native-dotenv": "3.4.11",
     "react-native-draggable-flatlist": "4.0.1",
-    "react-native-exit-app": "2.0.0",
     "react-native-fetch-api": "3.0.0",
     "react-native-fs": "2.20.0",
     "react-native-gesture-handler": "2.15.0",
diff --git a/src/screens/AppError.tsx b/src/screens/AppError.tsx
index 2d17131f7..1c5cbff5a 100644
--- a/src/screens/AppError.tsx
+++ b/src/screens/AppError.tsx
@@ -8,7 +8,6 @@ import {
 	Image,
 	Platform,
 } from 'react-native';
-import RNExitApp from 'react-native-exit-app';
 import { SafeAreaProvider } from 'react-native-safe-area-context';
 
 import SafeAreaInset from '../components/SafeAreaInset';
@@ -20,10 +19,6 @@ const imageSrc = require('../assets/illustrations/cross.png');
 type ReactError = Error & ErrorInfo;
 
 const AppError = ({ error }: { error: ReactError }): ReactElement => {
-	const onClose = (): void => {
-		RNExitApp.exitApp();
-	};
-
 	const onSend = async (): Promise<void> => {
 		const message = `Error: ${error.message}
 \nComponent Stack: ${error.componentStack}
@@ -62,13 +57,6 @@ const AppError = ({ error }: { error: ReactError }): ReactElement => {
 					</View>
 
 					<View style={styles.buttonContainer}>
-						<TouchableOpacity
-							style={[styles.button, styles.buttonSecondary]}
-							activeOpacity={0.7}
-							testID="ErrorClose"
-							onPress={onClose}>
-							<Text style={styles.buttonText}>Close Bitkit</Text>
-						</TouchableOpacity>
 						<TouchableOpacity
 							style={[styles.button, styles.buttonPrimary]}
 							activeOpacity={0.7}
@@ -157,10 +145,6 @@ const styles = StyleSheet.create({
 	buttonPrimary: {
 		backgroundColor: 'rgba(255, 255, 255, 0.08)',
 	},
-	buttonSecondary: {
-		borderColor: 'rgba(255, 255, 255, 0.08)',
-		borderWidth: 2,
-	},
 	buttonText: {
 		color: 'white',
 		fontSize: 15,
diff --git a/src/screens/Recovery/Recovery.tsx b/src/screens/Recovery/Recovery.tsx
index 15aa4ad2c..120c78740 100644
--- a/src/screens/Recovery/Recovery.tsx
+++ b/src/screens/Recovery/Recovery.tsx
@@ -3,7 +3,6 @@ import { StyleSheet, View } from 'react-native';
 import { useAppSelector } from '../../hooks/redux';
 import Share from 'react-native-share';
 import { useTranslation } from 'react-i18next';
-import RNExitApp from 'react-native-exit-app';
 
 import { wipeApp } from '../../store/utils/settings';
 import { openURL } from '../../utils/helpers';
@@ -96,10 +95,6 @@ const Recovery = ({
 		setShowWipeDialog(false);
 	};
 
-	const onCloseApp = (): void => {
-		RNExitApp.exitApp();
-	};
-
 	return (
 		<ThemedView style={styles.root}>
 			<SafeAreaInset type="top" />
@@ -141,15 +136,6 @@ const Recovery = ({
 						onPress={onWipeApp}
 					/>
 				</View>
-
-				<View style={styles.footer}>
-					<Button
-						text={t('close_app')}
-						size="large"
-						disabled={locked}
-						onPress={onCloseApp}
-					/>
-				</View>
 			</View>
 
 			<Dialog
@@ -179,9 +165,6 @@ const styles = StyleSheet.create({
 	button: {
 		marginBottom: 16,
 	},
-	footer: {
-		marginTop: 'auto',
-	},
 });
 
 export default Recovery;
diff --git a/yarn.lock b/yarn.lock
index 556a05029..77f4d5490 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6387,7 +6387,6 @@ __metadata:
     react-native-device-info: 11.1.0
     react-native-dotenv: 3.4.11
     react-native-draggable-flatlist: 4.0.1
-    react-native-exit-app: 2.0.0
     react-native-fetch-api: 3.0.0
     react-native-fs: 2.20.0
     react-native-gesture-handler: 2.15.0
@@ -14026,13 +14025,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native-exit-app@npm:2.0.0":
-  version: 2.0.0
-  resolution: "react-native-exit-app@npm:2.0.0"
-  checksum: d455ddd3a688625ec0521c0260a709e9e1dedaa7ef5bdebc76b87017056950f79366e2b4686f864c8127555a5359b6bfc5b2636477f99f86ad1920ea1d87360e
-  languageName: node
-  linkType: hard
-
 "react-native-fetch-api@npm:3.0.0":
   version: 3.0.0
   resolution: "react-native-fetch-api@npm:3.0.0"

From 910e7143c0ba3293f3f194dd7720d9d47a85cf6b Mon Sep 17 00:00:00 2001
From: Ivan Vershigora <ivan.vershigora@gmail.com>
Date: Sat, 7 Sep 2024 10:53:15 +0100
Subject: [PATCH 07/10] fix: prevent wallet from beeing initalized twice

---
 e2e/boost.e2e.js              | 36 +++++++++++++++++------------------
 src/store/actions/wallet.ts   |  2 ++
 src/store/index.ts            |  2 +-
 src/store/migrations/index.ts |  9 +++++++++
 src/store/shapes/settings.ts  |  2 +-
 src/store/slices/wallet.ts    |  5 ++++-
 6 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/e2e/boost.e2e.js b/e2e/boost.e2e.js
index 463a1bbe6..3fe5a424e 100644
--- a/e2e/boost.e2e.js
+++ b/e2e/boost.e2e.js
@@ -52,6 +52,15 @@ d('Boost', () => {
 			return;
 		}
 
+		// switch off RBF mode
+		await element(by.id('Settings')).tap();
+		if (!__DEV__) {
+			await element(by.id('DevOptions')).multiTap(5); // enable dev mode
+		}
+		await element(by.id('DevSettings')).tap();
+		await element(by.id('RBF')).tap();
+		await launchAndWait();
+
 		// fund the wallet
 		await element(by.id('Receive')).tap();
 		let { label: wAddress } = await element(by.id('QRCode')).getAttributes();
@@ -76,11 +85,10 @@ d('Boost', () => {
 		await sleep(500); // wait for keyboard to hide
 		await element(by.id('AddressContinue')).tap();
 		await element(by.id('N1').withAncestor(by.id('SendAmountNumberPad'))).tap();
-		for (let i = 0; i < 4; i++) {
-			await element(
-				by.id('N0').withAncestor(by.id('SendAmountNumberPad')),
-			).tap();
-		}
+		await element(by.id('N0').withAncestor(by.id('SendAmountNumberPad'))).tap();
+		await element(
+			by.id('N000').withAncestor(by.id('SendAmountNumberPad')),
+		).tap();
 		await expect(element(by.text('10 000'))).toBeVisible();
 		await element(by.id('ContinueAmount')).tap();
 		await element(by.id('GRAB')).swipe('right', 'slow', 0.95, 0.5, 0.5); // Swipe to confirm
@@ -164,15 +172,6 @@ d('Boost', () => {
 			return;
 		}
 
-		// switch to RBF mode
-		await element(by.id('Settings')).tap();
-		if (!__DEV__) {
-			await element(by.id('DevOptions')).multiTap(5); // enable dev mode
-		}
-		await element(by.id('DevSettings')).tap();
-		await element(by.id('RBF')).tap();
-		await launchAndWait();
-
 		// fund the wallet
 		await element(by.id('Receive')).tap();
 		let { label: wAddress } = await element(by.id('QRCode')).getAttributes();
@@ -197,11 +196,10 @@ d('Boost', () => {
 		await sleep(500); // wait for keyboard to hide
 		await element(by.id('AddressContinue')).tap();
 		await element(by.id('N1').withAncestor(by.id('SendAmountNumberPad'))).tap();
-		for (let i = 0; i < 4; i++) {
-			await element(
-				by.id('N0').withAncestor(by.id('SendAmountNumberPad')),
-			).tap();
-		}
+		await element(by.id('N0').withAncestor(by.id('SendAmountNumberPad'))).tap();
+		await element(
+			by.id('N000').withAncestor(by.id('SendAmountNumberPad')),
+		).tap();
 		await expect(element(by.text('10 000'))).toBeVisible();
 		await element(by.id('ContinueAmount')).tap();
 		await element(by.id('GRAB')).swipe('right', 'slow', 0.95, 0.5, 0.5); // Swipe to confirm
diff --git a/src/store/actions/wallet.ts b/src/store/actions/wallet.ts
index 55736c1f8..38839f6bb 100644
--- a/src/store/actions/wallet.ts
+++ b/src/store/actions/wallet.ts
@@ -50,6 +50,7 @@ import {
 	addUnconfirmedTransactions,
 	createWallet,
 	replaceImpactedAddresses,
+	setWalletExits,
 	updateHeader,
 	updateTransactions,
 	updateTransfer,
@@ -95,6 +96,7 @@ export const createWalletThunk = async ({
 			return err(response.error.message);
 		}
 		dispatch(createWallet(response.value));
+		dispatch(setWalletExits());
 		return ok('');
 	} catch (e) {
 		return err(e);
diff --git a/src/store/index.ts b/src/store/index.ts
index 4691a9cf0..ce3089c43 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -32,7 +32,7 @@ const persistConfig = {
 	key: 'root',
 	storage: reduxStorage,
 	// increase version after store shape changes
-	version: 43,
+	version: 44,
 	stateReconciler: autoMergeLevel2,
 	blacklist: ['receive', 'ui'],
 	migrate: createMigrate(migrations, { debug: __ENABLE_MIGRATION_DEBUG__ }),
diff --git a/src/store/migrations/index.ts b/src/store/migrations/index.ts
index b087fb0f2..6cf1e824b 100644
--- a/src/store/migrations/index.ts
+++ b/src/store/migrations/index.ts
@@ -16,6 +16,15 @@ const migrations = {
 			},
 		};
 	},
+	44: (state): PersistedState => {
+		return {
+			...state,
+			settings: {
+				...state.settings,
+				rbf: true,
+			},
+		};
+	},
 };
 
 export default migrations;
diff --git a/src/store/shapes/settings.ts b/src/store/shapes/settings.ts
index ad9c42d9a..1652602c2 100644
--- a/src/store/shapes/settings.ts
+++ b/src/store/shapes/settings.ts
@@ -82,7 +82,7 @@ export const initialSettingsState: TSettings = {
 	pinOnIdle: false,
 	pinForPayments: false,
 	biometrics: false,
-	rbf: false,
+	rbf: true,
 	theme: 'dark',
 	unit: EUnit.BTC,
 	denomination: EDenomination.modern,
diff --git a/src/store/slices/wallet.ts b/src/store/slices/wallet.ts
index 02033ae90..b6e0554a4 100644
--- a/src/store/slices/wallet.ts
+++ b/src/store/slices/wallet.ts
@@ -32,7 +32,6 @@ export const walletSlice = createSlice({
 	initialState: defaultWalletStoreShape,
 	reducers: {
 		createWallet: (state, action: PayloadAction<IWallets>) => {
-			state.walletExists = true;
 			state.wallets = {
 				...state.wallets,
 				...action.payload,
@@ -186,6 +185,9 @@ export const walletSlice = createSlice({
 		resetExchangeRates: (state) => {
 			state.exchangeRates = defaultWalletStoreShape.exchangeRates;
 		},
+		setWalletExits: (state) => {
+			state.walletExists = true;
+		},
 	},
 });
 
@@ -204,6 +206,7 @@ export const {
 	replaceImpactedAddresses,
 	resetSelectedWallet,
 	resetExchangeRates,
+	setWalletExits,
 } = actions;
 
 export default reducer;

From f9c4eaa5750c9d80456e18b5fd1d6fa43870b396 Mon Sep 17 00:00:00 2001
From: Philipp Walter <philippwalter@proton.me>
Date: Sat, 7 Sep 2024 15:00:03 +0200
Subject: [PATCH 08/10] refactor(settings): move LDK debug UI (#2209)

---
 e2e/lightning.e2e.js                          |   6 +-
 e2e/settings.e2e.js                           |   7 +-
 src/navigation/settings/SettingsNavigator.tsx |   3 +
 src/screens/Settings/DevSettings/LdkDebug.tsx | 433 ++++++++++++++++++
 src/screens/Settings/DevSettings/index.tsx    |  11 +-
 src/screens/Settings/Lightning/Channels.tsx   | 327 +------------
 6 files changed, 458 insertions(+), 329 deletions(-)
 create mode 100644 src/screens/Settings/DevSettings/LdkDebug.tsx

diff --git a/e2e/lightning.e2e.js b/e2e/lightning.e2e.js
index 6d18bbbd0..8e6fdf854 100644
--- a/e2e/lightning.e2e.js
+++ b/e2e/lightning.e2e.js
@@ -92,9 +92,11 @@ d('Lightning', () => {
 			).getAttributes();
 			await element(by.id('NavigationBack')).atIndex(0).tap();
 			await sleep(100);
+			await element(by.id('NavigationBack')).atIndex(0).tap();
+			await element(by.id('DevSettings')).tap();
+			await element(by.id('LDKDebug')).tap();
 
 			// connect to LND
-			await element(by.id('Channels')).tap();
 			await element(by.id('AddPeerInput')).replaceText(
 				`${lndNodeID}@127.0.0.1:9735`,
 			);
@@ -145,6 +147,8 @@ d('Lightning', () => {
 			await sleep(500);
 			await element(by.id('NavigationBack')).atIndex(0).tap();
 			await sleep(100);
+			await element(by.id('NavigationBack')).atIndex(0).tap();
+			await element(by.id('AdvancedSettings')).atIndex(0).tap();
 			await element(by.id('Channels')).tap();
 			await element(by.id('Channel')).atIndex(0).tap();
 			await expect(
diff --git a/e2e/settings.e2e.js b/e2e/settings.e2e.js
index f1b42e6f8..0a0536e56 100644
--- a/e2e/settings.e2e.js
+++ b/e2e/settings.e2e.js
@@ -407,8 +407,8 @@ d('Settings', () => {
 			if (!__DEV__) {
 				await element(by.id('DevOptions')).multiTap(5); // enable dev mode
 			}
-			await element(by.id('AdvancedSettings')).tap();
-			await element(by.id('Channels')).tap();
+			await element(by.id('DevSettings')).tap();
+			await element(by.id('LDKDebug')).tap();
 			await element(by.id('CopyNodeId')).tap();
 			await element(by.id('RefreshLDK')).tap();
 			await element(by.id('RestartLDK')).tap();
@@ -417,7 +417,8 @@ d('Settings', () => {
 				.toBeVisible()
 				.withTimeout(5000);
 			await element(by.id('NavigationBack')).atIndex(0).tap();
-
+			await element(by.id('NavigationBack')).atIndex(0).tap();
+			await element(by.id('AdvancedSettings')).tap();
 			await element(by.id('LightningNodeInfo')).tap();
 			// TODO: this fails too often on CI
 			// await waitFor(element(by.id('LDKNodeID')))
diff --git a/src/navigation/settings/SettingsNavigator.tsx b/src/navigation/settings/SettingsNavigator.tsx
index b42e01b74..0656f0810 100644
--- a/src/navigation/settings/SettingsNavigator.tsx
+++ b/src/navigation/settings/SettingsNavigator.tsx
@@ -15,6 +15,7 @@ import CoinSelectPreference from '../../screens/Settings/CoinSelectPreference';
 import PaymentPreference from '../../screens/Settings/PaymentPreference';
 import AddressTypePreference from '../../screens/Settings/AddressTypePreference';
 import DevSettings from '../../screens/Settings/DevSettings';
+import LdkDebug from '../../screens/Settings/DevSettings/LdkDebug';
 import AddressViewer from '../../screens/Settings/AddressViewer';
 import LightningNodeInfo from '../../screens/Settings/Lightning/LightningNodeInfo';
 import UnitSettings from '../../screens/Settings/Unit';
@@ -91,6 +92,7 @@ export type SettingsStackParamList = {
 	PaymentPreference: undefined;
 	AddressTypePreference: undefined;
 	DevSettings: undefined;
+	LdkDebug: undefined;
 	ExportToPhone: undefined;
 	ResetAndRestore: undefined;
 	BitcoinNetworkSelection: undefined;
@@ -160,6 +162,7 @@ const SettingsNavigator = (): ReactElement => {
 				component={AddressTypePreference}
 			/>
 			<Stack.Screen name="DevSettings" component={DevSettings} />
+			<Stack.Screen name="LdkDebug" component={LdkDebug} />
 			<Stack.Screen name="AddressViewer" component={AddressViewer} />
 			<Stack.Screen name="ExportToPhone" component={ExportToPhone} />
 			<Stack.Screen name="ResetAndRestore" component={ResetAndRestore} />
diff --git a/src/screens/Settings/DevSettings/LdkDebug.tsx b/src/screens/Settings/DevSettings/LdkDebug.tsx
new file mode 100644
index 000000000..dcbf2652e
--- /dev/null
+++ b/src/screens/Settings/DevSettings/LdkDebug.tsx
@@ -0,0 +1,433 @@
+import React, { ReactElement, memo, useState } from 'react';
+import { StyleSheet, ScrollView } from 'react-native';
+import Share from 'react-native-share';
+import { useTranslation } from 'react-i18next';
+import Clipboard from '@react-native-clipboard/clipboard';
+import lm from '@synonymdev/react-native-ldk';
+
+import { Caption13Up } from '../../../styles/text';
+import { View as ThemedView, TextInput } from '../../../styles/components';
+import SafeAreaInset from '../../../components/SafeAreaInset';
+import Button from '../../../components/buttons/Button';
+import NavigationHeader from '../../../components/NavigationHeader';
+import { useLightningBalance } from '../../../hooks/lightning';
+import { useAppDispatch, useAppSelector } from '../../../hooks/redux';
+import { zipLogs } from '../../../utils/lightning/logs';
+import { showToast } from '../../../utils/notifications';
+import {
+	addPeer,
+	getNodeId,
+	payLightningInvoice,
+	rebroadcastAllKnownTransactions,
+	recoverOutputs,
+	recoverOutputsFromForceClose,
+	refreshLdk,
+	setupLdk,
+	removeUnusedPeers,
+} from '../../../utils/lightning';
+import { openChannelsSelector } from '../../../store/reselect/lightning';
+import { showBottomSheet } from '../../../store/utils/ui';
+import { removeLightningPeer } from '../../../store/slices/lightning';
+import {
+	createLightningInvoice,
+	savePeer,
+} from '../../../store/utils/lightning';
+import {
+	selectedNetworkSelector,
+	selectedWalletSelector,
+} from '../../../store/reselect/wallet';
+
+const LdkDebug = (): ReactElement => {
+	const { t } = useTranslation('lightning');
+	const dispatch = useAppDispatch();
+	const [peer, setPeer] = useState('');
+	const [payingInvoice, setPayingInvoice] = useState(false);
+	const [refreshingLdk, setRefreshingLdk] = useState(false);
+	const [restartingLdk, setRestartingLdk] = useState(false);
+	const [rebroadcastingLdk, setRebroadcastingLdk] = useState(false);
+	const [spendingStuckOutputs, setSpendingStuckOutputs] = useState(false);
+
+	const { localBalance, remoteBalance } = useLightningBalance();
+	const selectedWallet = useAppSelector(selectedWalletSelector);
+	const selectedNetwork = useAppSelector(selectedNetworkSelector);
+	const openChannels = useAppSelector(openChannelsSelector);
+
+	const onNodeId = async (): Promise<void> => {
+		const nodeId = await getNodeId();
+		if (nodeId.isErr()) {
+			console.log(nodeId.error.message);
+			return;
+		}
+		console.log(`Node ID: ${nodeId.value}`);
+		Clipboard.setString(nodeId.value);
+		showToast({
+			type: 'success',
+			title: 'Copied Node ID to Clipboard',
+			description: nodeId.value,
+		});
+	};
+
+	const onRefreshLdk = async (): Promise<void> => {
+		setRefreshingLdk(true);
+		await refreshLdk({ selectedWallet, selectedNetwork });
+		setRefreshingLdk(false);
+	};
+
+	const onRestartLdk = async (): Promise<void> => {
+		setRestartingLdk(true);
+		await setupLdk({ selectedWallet, selectedNetwork });
+		setRestartingLdk(false);
+	};
+
+	const onAddPeer = async (): Promise<void> => {
+		if (!peer) {
+			// Attempt to grab and set peer string from clipboard.
+			const clipboardStr = await Clipboard.getString();
+			setPeer(clipboardStr);
+			return;
+		}
+		const addPeerRes = await addPeer({ peer, timeout: 5000 });
+		if (addPeerRes.isErr()) {
+			showToast({
+				type: 'warning',
+				title: t('error_add_title'),
+				description: addPeerRes.error.message,
+			});
+			return;
+		}
+		const savePeerRes = savePeer({ selectedWallet, selectedNetwork, peer });
+		if (savePeerRes.isErr()) {
+			showToast({
+				type: 'warning',
+				title: t('error_save_title'),
+				description: savePeerRes.error.message,
+			});
+			return;
+		}
+		showToast({
+			type: 'success',
+			title: savePeerRes.value,
+			description: t('peer_saved'),
+		});
+	};
+
+	const onListPeers = async (): Promise<void> => {
+		const peers = await lm.getPeers();
+		console.log({ peers });
+	};
+
+	const onDisconnectPeers = async (): Promise<void> => {
+		const peers = await lm.getPeers();
+
+		const promises = peers.map(({ pubKey, address, port }) => {
+			const peerStr = `${pubKey}@${address}:${port}`;
+			// Remove peer from local storage
+			dispatch(
+				removeLightningPeer({
+					peer: peerStr,
+					selectedWallet,
+					selectedNetwork,
+				}),
+			);
+			// Instruct LDK to disconnect from peer
+			return lm.removePeer({ pubKey, address, port, timeout: 5000 });
+		});
+
+		const results = await Promise.all(promises);
+		for (const result of results) {
+			if (result.isOk()) {
+				console.log('Disconnected from peer.');
+			} else {
+				console.error(`Failed to disconnect: ${result.error.message}`);
+			}
+		}
+	};
+
+	const onRemoveUnusedPeers = async (): Promise<void> => {
+		const res = await removeUnusedPeers({ selectedWallet, selectedNetwork });
+		if (res.isErr()) {
+			showToast({
+				type: 'warning',
+				title: 'No unused peers removed',
+				description: res.error.message,
+			});
+		} else {
+			showToast({
+				type: 'info',
+				title: 'Removed unused peers',
+				description: res.value,
+			});
+		}
+	};
+
+	const onExportLogs = async (): Promise<void> => {
+		const result = await zipLogs();
+		if (result.isErr()) {
+			showToast({
+				type: 'warning',
+				title: t('error_logs'),
+				description: t('error_logs_description'),
+			});
+			return;
+		}
+
+		// Share the zip file
+		await Share.open({
+			type: 'application/zip',
+			url: `file://${result.value}`,
+			title: t('export_logs'),
+		});
+	};
+
+	const onCreateInvoice = async (amountSats = 100): Promise<void> => {
+		const createPaymentRequest = await createLightningInvoice({
+			amountSats,
+			description: '',
+			expiryDeltaSeconds: 99999,
+			selectedNetwork,
+			selectedWallet,
+		});
+		if (createPaymentRequest.isErr()) {
+			showToast({
+				type: 'warning',
+				title: t('error_invoice'),
+				description: createPaymentRequest.error.message,
+			});
+			return;
+		}
+		const { to_str } = createPaymentRequest.value;
+		console.log(to_str);
+		Clipboard.setString(to_str);
+		showToast({
+			type: 'success',
+			title: t('invoice_copied'),
+			description: to_str,
+		});
+	};
+
+	const onRebroadcastLdkTxs = async (): Promise<void> => {
+		setRebroadcastingLdk(true);
+		await rebroadcastAllKnownTransactions();
+		setRebroadcastingLdk(false);
+	};
+
+	const onSpendStuckOutputs = async (): Promise<void> => {
+		setSpendingStuckOutputs(true);
+		const res = await recoverOutputs();
+		if (res.isOk()) {
+			showToast({
+				type: 'info',
+				title: 'Stuck outputs recovered',
+				description: res.value,
+			});
+		} else {
+			showToast({
+				type: 'warning',
+				title: 'No stuck outputs recovered',
+				description: res.error.message,
+			});
+		}
+		setSpendingStuckOutputs(false);
+	};
+
+	const onForceCloseChannels = (): void => {
+		showBottomSheet('forceTransfer');
+	};
+
+	const onSpendOutputsFromForceClose = async (): Promise<void> => {
+		setSpendingStuckOutputs(true);
+		const res = await recoverOutputsFromForceClose();
+		if (res.isOk()) {
+			showToast({
+				type: 'info',
+				title: 'Completed',
+				description: res.value,
+			});
+		} else {
+			showToast({
+				type: 'warning',
+				title: 'No stuck outputs recovered',
+				description: res.error.message,
+			});
+		}
+		setSpendingStuckOutputs(false);
+	};
+
+	const onPayInvoiceFromClipboard = async (): Promise<void> => {
+		setPayingInvoice(true);
+		const invoice = await Clipboard.getString();
+		if (!invoice) {
+			showToast({
+				type: 'warning',
+				title: 'No Invoice Detected',
+				description: 'Unable to retrieve anything from the clipboard.',
+			});
+			setPayingInvoice(false);
+			return;
+		}
+		const response = await payLightningInvoice({ invoice });
+		if (response.isErr()) {
+			showToast({
+				type: 'warning',
+				title: 'Invoice Payment Failed',
+				description: response.error.message,
+			});
+			setPayingInvoice(false);
+			return;
+		}
+		await refreshLdk({ selectedWallet, selectedNetwork });
+		setPayingInvoice(false);
+	};
+
+	return (
+		<ThemedView style={styles.root}>
+			<SafeAreaInset type="top" />
+			<NavigationHeader title="LDK Debug" />
+			<ScrollView contentContainerStyle={styles.content}>
+				<Caption13Up color="secondary">Add Peer</Caption13Up>
+				<TextInput
+					style={styles.textInput}
+					autoCapitalize="none"
+					autoComplete="off"
+					autoCorrect={false}
+					autoFocus={false}
+					value={peer}
+					placeholder="publicKey@ip:port"
+					multiline={true}
+					blurOnSubmit
+					returnKeyType="done"
+					testID="AddPeerInput"
+					onChangeText={setPeer}
+				/>
+				<Button
+					style={styles.button}
+					text={
+						peer ? 'Add Lightning Peer' : 'Paste Lightning Peer From Clipboard'
+					}
+					testID="AddPeerButton"
+					onPress={onAddPeer}
+				/>
+
+				<Caption13Up style={styles.sectionTitle} color="secondary">
+					Debug
+				</Caption13Up>
+				<Button
+					style={styles.button}
+					text="Get Node ID"
+					testID="CopyNodeId"
+					onPress={onNodeId}
+				/>
+				<Button
+					style={styles.button}
+					text="Refresh LDK"
+					loading={refreshingLdk}
+					testID="RefreshLDK"
+					onPress={onRefreshLdk}
+				/>
+				<Button
+					style={styles.button}
+					text="Restart LDK"
+					loading={restartingLdk}
+					testID="RestartLDK"
+					onPress={onRestartLdk}
+				/>
+				<Button style={styles.button} text="List Peers" onPress={onListPeers} />
+				<Button
+					style={styles.button}
+					text="Disconnect Peers"
+					onPress={onDisconnectPeers}
+				/>
+				<Button
+					style={styles.button}
+					text="Remove Unused Peers"
+					onPress={onRemoveUnusedPeers}
+				/>
+				<Button
+					style={styles.button}
+					text="Rebroadcast LDK Txs"
+					loading={rebroadcastingLdk}
+					testID="RebroadcastLDKTXS"
+					onPress={onRebroadcastLdkTxs}
+				/>
+				<Button
+					style={styles.button}
+					text="Spend Stuck Outputs"
+					loading={spendingStuckOutputs}
+					onPress={onSpendStuckOutputs}
+				/>
+				<Button
+					style={styles.button}
+					text="Force Close Channels"
+					onPress={onForceCloseChannels}
+				/>
+				<Button
+					style={styles.button}
+					text="Spend outputs from force close"
+					loading={spendingStuckOutputs}
+					onPress={onSpendOutputsFromForceClose}
+				/>
+				<Button
+					style={styles.button}
+					text="Export Logs"
+					onPress={onExportLogs}
+				/>
+
+				{openChannels.length > 0 && (
+					<>
+						<Button
+							style={styles.button}
+							text="Create Invoice: 100 sats"
+							disabled={remoteBalance < 100}
+							onPress={() => onCreateInvoice(100)}
+						/>
+						<Button
+							style={styles.button}
+							text="Create Invoice: 5000 sats"
+							disabled={remoteBalance < 5000}
+							onPress={() => onCreateInvoice(5000)}
+						/>
+						<Button
+							style={styles.button}
+							text="Pay Invoice From Clipboard"
+							loading={payingInvoice}
+							disabled={localBalance <= 0}
+							onPress={onPayInvoiceFromClipboard}
+						/>
+					</>
+				)}
+
+				<SafeAreaInset type="bottom" minPadding={16} />
+			</ScrollView>
+		</ThemedView>
+	);
+};
+
+const styles = StyleSheet.create({
+	root: {
+		flex: 1,
+	},
+	content: {
+		flexGrow: 1,
+		paddingHorizontal: 16,
+	},
+	sectionTitle: {
+		marginTop: 32,
+	},
+	textInput: {
+		width: '100%',
+		minHeight: 50,
+		borderRadius: 10,
+		padding: 10,
+		textAlign: 'left',
+		alignItems: 'center',
+		justifyContent: 'center',
+		fontWeight: 'bold',
+		fontSize: 16,
+		marginTop: 8,
+	},
+	button: {
+		marginTop: 8,
+	},
+});
+
+export default memo(LdkDebug);
diff --git a/src/screens/Settings/DevSettings/index.tsx b/src/screens/Settings/DevSettings/index.tsx
index 5a07160f2..6f8501a94 100644
--- a/src/screens/Settings/DevSettings/index.tsx
+++ b/src/screens/Settings/DevSettings/index.tsx
@@ -149,7 +149,16 @@ const DevSettings = ({
 		},
 		{
 			title: 'Debug',
-			data: [],
+			data: [
+				{
+					title: 'LDK',
+					type: EItemType.button,
+					testID: 'LDKDebug',
+					onPress: (): void => {
+						navigation.navigate('LdkDebug');
+					},
+				},
+			],
 		},
 		{
 			title: 'Wallet Checks',
diff --git a/src/screens/Settings/Lightning/Channels.tsx b/src/screens/Settings/Lightning/Channels.tsx
index be640518c..d8c91a50b 100644
--- a/src/screens/Settings/Lightning/Channels.tsx
+++ b/src/screens/Settings/Lightning/Channels.tsx
@@ -9,15 +9,10 @@ import {
 import Share from 'react-native-share';
 import { FadeIn, FadeOut } from 'react-native-reanimated';
 import { useTranslation } from 'react-i18next';
-import Clipboard from '@react-native-clipboard/clipboard';
 import { IBtOrder } from '@synonymdev/blocktank-lsp-http-client';
 import { BtOrderState2 } from '@synonymdev/blocktank-lsp-http-client/dist/shared/BtOrderState2';
 
-import {
-	AnimatedView,
-	View as ThemedView,
-	TextInput,
-} from '../../../styles/components';
+import { AnimatedView, View as ThemedView } from '../../../styles/components';
 import { Caption13Up, BodyMSB } from '../../../styles/text';
 import {
 	ChevronRight,
@@ -36,27 +31,13 @@ import Money from '../../../components/Money';
 import useColors from '../../../hooks/colors';
 import { useAppSelector } from '../../../hooks/redux';
 import { refreshOrdersList } from '../../../store/utils/blocktank';
-import {
-	addPeer,
-	getNodeId,
-	payLightningInvoice,
-	rebroadcastAllKnownTransactions,
-	recoverOutputs,
-	recoverOutputsFromForceClose,
-	refreshLdk,
-	setupLdk,
-	removeUnusedPeers,
-} from '../../../utils/lightning';
+import { refreshLdk } from '../../../utils/lightning';
 import { showToast } from '../../../utils/notifications';
 import {
 	useLightningChannelName,
 	useLightningBalance,
 	useLightningChannelBalance,
 } from '../../../hooks/lightning';
-import {
-	createLightningInvoice,
-	savePeer,
-} from '../../../store/utils/lightning';
 import {
 	selectedNetworkSelector,
 	selectedWalletSelector,
@@ -66,7 +47,6 @@ import {
 	openChannelsSelector,
 	pendingChannelsSelector,
 } from '../../../store/reselect/lightning';
-import { enableDevOptionsSelector } from '../../../store/reselect/settings';
 import { zipLogs } from '../../../utils/lightning/logs';
 import { SettingsScreenProps } from '../../../navigation/types';
 import {
@@ -75,7 +55,6 @@ import {
 } from '../../../store/reselect/blocktank';
 import { TPaidBlocktankOrders } from '../../../store/types/blocktank';
 import { EUnit } from '../../../store/types/wallet';
-import { showBottomSheet } from '../../../store/utils/ui';
 import { EChannelStatus, TChannel } from '../../../store/types/lightning';
 
 /**
@@ -220,23 +199,16 @@ const Channels = ({
 	route,
 }: SettingsScreenProps<'Channels'>): ReactElement => {
 	const { t } = useTranslation('lightning');
-	const [peer, setPeer] = useState('');
+	const [refreshingLdk, setRefreshingLdk] = useState(false);
 	const [showClosed, setShowClosed] = useState(
 		route.params?.showClosed ?? false,
 	);
-	const [payingInvoice, setPayingInvoice] = useState(false);
-	const [refreshingLdk, setRefreshingLdk] = useState(false);
-	const [restartingLdk, setRestartingLdk] = useState(false);
-	const [rebroadcastingLdk, setRebroadcastingLdk] = useState(false);
-	const [spendingStuckOutputs, setSpendingStuckOutputs] = useState(false);
 
 	const colors = useColors();
 	const br = useBreakpoints();
 	const { localBalance, remoteBalance } = useLightningBalance();
 	const selectedWallet = useAppSelector(selectedWalletSelector);
 	const selectedNetwork = useAppSelector(selectedNetworkSelector);
-	const enableDevOptions = useAppSelector(enableDevOptionsSelector);
-
 	const blocktankOrders = useAppSelector(blocktankOrdersSelector);
 	const paidOrders = useAppSelector(blocktankPaidOrdersSelector);
 	const openChannels = useAppSelector(openChannelsSelector);
@@ -279,32 +251,6 @@ const Channels = ({
 		[navigation],
 	);
 
-	const createInvoice = async (amountSats = 100): Promise<void> => {
-		const createPaymentRequest = await createLightningInvoice({
-			amountSats,
-			description: '',
-			expiryDeltaSeconds: 99999,
-			selectedNetwork,
-			selectedWallet,
-		});
-		if (createPaymentRequest.isErr()) {
-			showToast({
-				type: 'warning',
-				title: t('error_invoice'),
-				description: createPaymentRequest.error.message,
-			});
-			return;
-		}
-		const { to_str } = createPaymentRequest.value;
-		console.log(to_str);
-		Clipboard.setString(to_str);
-		showToast({
-			type: 'success',
-			title: t('invoice_copied'),
-			description: to_str,
-		});
-	};
-
 	const onRefreshLdk = useCallback(async (): Promise<void> => {
 		setRefreshingLdk(true);
 		await refreshLdk({ selectedWallet, selectedNetwork });
@@ -312,58 +258,6 @@ const Channels = ({
 		setRefreshingLdk(false);
 	}, [selectedNetwork, selectedWallet]);
 
-	const onAddPeer = useCallback(async () => {
-		if (!peer) {
-			// Attempt to grab and set peer string from clipboard.
-			const clipboardStr = await Clipboard.getString();
-			setPeer(clipboardStr);
-			return;
-		}
-		const addPeerRes = await addPeer({
-			peer,
-			timeout: 5000,
-		});
-		if (addPeerRes.isErr()) {
-			showToast({
-				type: 'warning',
-				title: t('error_add_title'),
-				description: addPeerRes.error.message,
-			});
-			return;
-		}
-		const savePeerRes = savePeer({ selectedWallet, selectedNetwork, peer });
-		if (savePeerRes.isErr()) {
-			showToast({
-				type: 'warning',
-				title: t('error_save_title'),
-				description: savePeerRes.error.message,
-			});
-			return;
-		}
-		showToast({
-			type: 'success',
-			title: savePeerRes.value,
-			description: t('peer_saved'),
-		});
-	}, [peer, selectedNetwork, selectedWallet, t]);
-
-	const onRemoveUnusedPeers = useCallback(async () => {
-		const res = await removeUnusedPeers({ selectedWallet, selectedNetwork });
-		if (res.isErr()) {
-			showToast({
-				type: 'warning',
-				title: 'No unused peers removed',
-				description: res.error.message,
-			});
-		} else {
-			showToast({
-				type: 'info',
-				title: 'Removed unused peers',
-				description: res.value,
-			});
-		}
-	}, [selectedNetwork, selectedWallet]);
-
 	return (
 		<ThemedView style={styles.root}>
 			<SafeAreaInset type="top" />
@@ -471,202 +365,6 @@ const Channels = ({
 					/>
 				)}
 
-				{enableDevOptions && (
-					<View style={styles.devButtons}>
-						<Caption13Up color="secondary" style={styles.sectionTitle}>
-							Dev Options
-						</Caption13Up>
-						<TextInput
-							autoCapitalize="none"
-							autoComplete="off"
-							autoCorrect={false}
-							autoFocus={false}
-							style={styles.textInput}
-							value={peer}
-							placeholder="publicKey@ip:port"
-							multiline={true}
-							onChangeText={(txt: string): void => {
-								setPeer(txt);
-							}}
-							blurOnSubmit
-							returnKeyType="done"
-							testID="AddPeerInput"
-						/>
-						<Button
-							style={styles.devButton}
-							text={
-								peer
-									? 'Add Lightning Peer'
-									: 'Paste Lightning Peer From Clipboard'
-							}
-							onPress={onAddPeer}
-							testID="AddPeerButton"
-						/>
-						<Button
-							style={styles.devButton}
-							text="Remove unused peers"
-							onPress={onRemoveUnusedPeers}
-						/>
-						<Button
-							style={styles.devButton}
-							text="Refresh LDK"
-							loading={refreshingLdk}
-							onPress={onRefreshLdk}
-							testID="RefreshLDK"
-						/>
-						<Button
-							style={styles.devButton}
-							text="Restart LDK"
-							loading={restartingLdk}
-							onPress={async (): Promise<void> => {
-								setRestartingLdk(true);
-								await setupLdk({ selectedWallet, selectedNetwork });
-								setRestartingLdk(false);
-							}}
-							testID="RestartLDK"
-						/>
-						<Button
-							style={styles.devButton}
-							text="Rebroadcast LDK TXS"
-							loading={rebroadcastingLdk}
-							onPress={async (): Promise<void> => {
-								setRebroadcastingLdk(true);
-								await rebroadcastAllKnownTransactions();
-								setRebroadcastingLdk(false);
-							}}
-							testID="RebroadcastLDKTXS"
-						/>
-						<Button
-							style={styles.devButton}
-							text="Spend stuck outputs"
-							loading={spendingStuckOutputs}
-							onPress={async (): Promise<void> => {
-								setSpendingStuckOutputs(true);
-								const res = await recoverOutputs();
-								if (res.isOk()) {
-									showToast({
-										type: 'info',
-										title: 'Stuck outputs recovered',
-										description: res.value,
-									});
-								} else {
-									showToast({
-										type: 'warning',
-										title: 'No stuck outputs recovered',
-										description: res.error.message,
-									});
-								}
-								setSpendingStuckOutputs(false);
-							}}
-						/>
-						<Button
-							style={styles.devButton}
-							text="Force close channels"
-							onPress={(): void => {
-								showBottomSheet('forceTransfer');
-							}}
-						/>
-						<Button
-							style={styles.devButton}
-							text="Spend outputs from force close"
-							loading={spendingStuckOutputs}
-							onPress={async (): Promise<void> => {
-								setSpendingStuckOutputs(true);
-								const res = await recoverOutputsFromForceClose();
-								if (res.isOk()) {
-									showToast({
-										type: 'info',
-										title: 'Completed',
-										description: res.value,
-									});
-								} else {
-									showToast({
-										type: 'warning',
-										title: 'No stuck outputs recovered',
-										description: res.error.message,
-									});
-								}
-								setSpendingStuckOutputs(false);
-							}}
-						/>
-						<Button
-							style={styles.devButton}
-							text="Get Node ID"
-							onPress={async (): Promise<void> => {
-								const nodeId = await getNodeId();
-								if (nodeId.isErr()) {
-									console.log(nodeId.error.message);
-									return;
-								}
-								console.log(nodeId.value);
-								Clipboard.setString(nodeId.value);
-								showToast({
-									type: 'success',
-									title: 'Copied Node ID to Clipboard',
-									description: nodeId.value,
-								});
-							}}
-							testID="CopyNodeId"
-						/>
-
-						{openChannels.length > 0 && (
-							<>
-								{remoteBalance > 100 && (
-									<Button
-										style={styles.devButton}
-										text="Create Invoice: 100 sats"
-										onPress={async (): Promise<void> => {
-											createInvoice(100).then();
-										}}
-									/>
-								)}
-								{remoteBalance > 5000 && (
-									<Button
-										style={styles.devButton}
-										text="Create Invoice: 5000 sats"
-										onPress={async (): Promise<void> => {
-											createInvoice(5000).then();
-										}}
-									/>
-								)}
-								{localBalance > 0 && (
-									<>
-										<Button
-											style={styles.devButton}
-											text="Pay Invoice From Clipboard"
-											loading={payingInvoice}
-											onPress={async (): Promise<void> => {
-												setPayingInvoice(true);
-												const invoice = await Clipboard.getString();
-												if (!invoice) {
-													showToast({
-														type: 'warning',
-														title: 'No Invoice Detected',
-														description:
-															'Unable to retrieve anything from the clipboard.',
-													});
-												}
-												const response = await payLightningInvoice({ invoice });
-												if (response.isErr()) {
-													showToast({
-														type: 'warning',
-														title: 'Invoice Payment Failed',
-														description: response.error.message,
-													});
-													setPayingInvoice(false);
-													return;
-												}
-												await refreshLdk({ selectedWallet, selectedNetwork });
-												setPayingInvoice(false);
-											}}
-										/>
-									</>
-								)}
-							</>
-						)}
-					</View>
-				)}
-
 				<View style={[styles.buttons, br.up('sm') && styles.buttonsRow]}>
 					<Button
 						style={styles.button}
@@ -729,25 +427,6 @@ const styles = StyleSheet.create({
 	nName: {
 		marginRight: 8,
 	},
-	textInput: {
-		width: '100%',
-		minHeight: 50,
-		borderRadius: 10,
-		padding: 10,
-		textAlign: 'left',
-		alignItems: 'center',
-		justifyContent: 'center',
-		fontWeight: 'bold',
-		fontSize: 16,
-		marginTop: 8,
-	},
-	devButtons: {
-		marginTop: 'auto',
-		marginBottom: 16,
-	},
-	devButton: {
-		marginTop: 8,
-	},
 	buttons: {
 		marginTop: 'auto',
 		gap: 16,

From b08f08b9da37171faf158fc04a5acaca2dcfc84d Mon Sep 17 00:00:00 2001
From: Jason <jayvdb1@gmail.com>
Date: Mon, 9 Sep 2024 09:11:27 +0200
Subject: [PATCH 09/10] chore: update react-native-ldk

---
 ios/Podfile.lock |  4 ++--
 package.json     |  2 +-
 yarn.lock        | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 2710f7c72..3bfce81c1 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1028,7 +1028,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-ldk (0.0.150):
+  - react-native-ldk (0.0.152):
     - React
   - react-native-mmkv (2.12.2):
     - DoubleConversion
@@ -1809,7 +1809,7 @@ SPEC CHECKSUMS:
   react-native-biometrics: 352e5a794bfffc46a0c86725ea7dc62deb085bdc
   react-native-blur: a2acf22fd7bd13621df5e0b1c130b81adea7009c
   react-native-image-picker: c3afe5472ef870d98a4b28415fc0b928161ee5f7
-  react-native-ldk: 2b19de9eb94dcfd46f3f2a7191502292b75a5d7a
+  react-native-ldk: 1d25080cfadac349eab355725da66de140fbc7a8
   react-native-mmkv: 8c9a677e64a1ac89b0c6cf240feea528318b3074
   react-native-netinfo: bdb108d340cdb41875c9ced535977cac6d2ff321
   react-native-quick-base64: a74c4b2607b9de016877a8edb776b6ac59785809
diff --git a/package.json b/package.json
index 3e32ea844..6728b3d6f 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "@synonymdev/feeds": "3.0.0",
     "@synonymdev/ledger": "0.0.5",
     "@synonymdev/react-native-keychain": "8.2.2",
-    "@synonymdev/react-native-ldk": "0.0.150",
+    "@synonymdev/react-native-ldk": "0.0.152",
     "@synonymdev/react-native-lnurl": "0.0.10",
     "@synonymdev/result": "0.0.2",
     "@synonymdev/slashtags-keychain": "1.0.0",
diff --git a/yarn.lock b/yarn.lock
index 77f4d5490..f55515b5f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4670,16 +4670,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@synonymdev/react-native-ldk@npm:0.0.150":
-  version: 0.0.150
-  resolution: "@synonymdev/react-native-ldk@npm:0.0.150"
+"@synonymdev/react-native-ldk@npm:0.0.152":
+  version: 0.0.152
+  resolution: "@synonymdev/react-native-ldk@npm:0.0.152"
   dependencies:
     "@synonymdev/raw-transaction-decoder": 1.1.0
     bech32: ^2.0.0
     bitcoinjs-lib: ^6.0.2
   peerDependencies:
     react-native: "*"
-  checksum: e3fcbd1237e83913f9450cb706189e85dbdf6add9f8fabd181bbc551d9a07514193bcaf680a833fa1af54d90a7251eca2bfdeff49b01748542d2c13aefdd6a3d
+  checksum: 5b702469b0ba9ff2121be186e6e9e00b86b8c5b2a978246af191fcec36d8a5e69c6a06bccf4def8716e5a2adb4d93ed1d0d21ded2574ce960ce87105963361e6
   languageName: node
   linkType: hard
 
@@ -6322,7 +6322,7 @@ __metadata:
     "@synonymdev/feeds": 3.0.0
     "@synonymdev/ledger": 0.0.5
     "@synonymdev/react-native-keychain": 8.2.2
-    "@synonymdev/react-native-ldk": 0.0.150
+    "@synonymdev/react-native-ldk": 0.0.152
     "@synonymdev/react-native-lnurl": 0.0.10
     "@synonymdev/result": 0.0.2
     "@synonymdev/slashtags-keychain": 1.0.0

From c7432721e886dc49b57d9b138f25031a257ab415 Mon Sep 17 00:00:00 2001
From: Ivan Vershigora <ivan.vershigora@gmail.com>
Date: Mon, 9 Sep 2024 11:09:16 +0100
Subject: [PATCH 10/10] fix: sync language files

---
 src/utils/i18n/locales/ca/cards.json         |   3 -
 src/utils/i18n/locales/ca/common.json        |   3 +
 src/utils/i18n/locales/ca/lightning.json     |  53 ++--
 src/utils/i18n/locales/cs/cards.json         |   2 +-
 src/utils/i18n/locales/cs/common.json        |   9 +
 src/utils/i18n/locales/cs/lightning.json     | 255 +++++++++++--------
 src/utils/i18n/locales/cs/other.json         |   8 +
 src/utils/i18n/locales/el/cards.json         |   3 -
 src/utils/i18n/locales/es_419/cards.json     |   3 -
 src/utils/i18n/locales/es_419/lightning.json |  46 ++--
 src/utils/i18n/locales/es_ES/cards.json      |   3 -
 src/utils/i18n/locales/es_ES/lightning.json  |  46 ++--
 src/utils/i18n/locales/fr/cards.json         |   3 -
 src/utils/i18n/locales/fr/common.json        |   3 +
 src/utils/i18n/locales/fr/lightning.json     | 147 +++--------
 src/utils/i18n/locales/it/cards.json         |   3 -
 src/utils/i18n/locales/it/common.json        |   3 +
 src/utils/i18n/locales/it/lightning.json     | 150 +++--------
 src/utils/i18n/locales/nl/cards.json         |   3 -
 src/utils/i18n/locales/nl/lightning.json     | 100 +++-----
 src/utils/i18n/locales/pl/cards.json         |   3 -
 src/utils/i18n/locales/pl/fee.json           |  14 +-
 src/utils/i18n/locales/pl/lightning.json     |   3 -
 src/utils/i18n/locales/pt_BR/cards.json      |   3 -
 src/utils/i18n/locales/pt_BR/common.json     |   3 +
 src/utils/i18n/locales/pt_BR/lightning.json  | 147 +++--------
 src/utils/i18n/locales/ru/cards.json         |   3 -
 src/utils/i18n/locales/ru/common.json        |   3 +
 src/utils/i18n/locales/ru/lightning.json     | 141 +++-------
 29 files changed, 434 insertions(+), 732 deletions(-)

diff --git a/src/utils/i18n/locales/ca/cards.json b/src/utils/i18n/locales/ca/cards.json
index 486e68643..19d5403c4 100644
--- a/src/utils/i18n/locales/ca/cards.json
+++ b/src/utils/i18n/locales/ca/cards.json
@@ -69,9 +69,6 @@
     }
   },
   "transferClosingChannel": {
-    "title": {
-      "string": "Iniciant..."
-    },
     "description": {
       "string": "Mantenir l'aplicació oberta"
     }
diff --git a/src/utils/i18n/locales/ca/common.json b/src/utils/i18n/locales/ca/common.json
index b1ce76940..e29575442 100644
--- a/src/utils/i18n/locales/ca/common.json
+++ b/src/utils/i18n/locales/ca/common.json
@@ -85,5 +85,8 @@
   },
   "connect": {
     "string": "Conecta"
+  },
+  "default": {
+    "string": "Predeterminat"
   }
 }
diff --git a/src/utils/i18n/locales/ca/lightning.json b/src/utils/i18n/locales/ca/lightning.json
index 4884e3a6e..3f2bcc91c 100644
--- a/src/utils/i18n/locales/ca/lightning.json
+++ b/src/utils/i18n/locales/ca/lightning.json
@@ -1,5 +1,5 @@
 {
-  "introduction": {
+  "transfer_intro": {
     "button": {
       "string": "Començar"
     }
@@ -16,21 +16,38 @@
     "nav_title": {
       "string": "Transferir fons"
     },
-    "nav_successful": {
-      "string": "Transferència realitzada"
-    },
-    "text_numpad": {
-      "string": "Introduïu la quantitat de diners que voleu poder gastar de forma instantània."
+    "confirm": {
+      "string": "Si us plau\n<accent>confirma</accent>"
     },
     "swipe": {
       "string": "Desplaçar per Transferir"
     }
   },
+  "spending_intro": {
+    "button": {
+      "string": "Començar"
+    }
+  },
   "transfer_failed": {
     "continue": {
       "string": "Torna a intentar"
     }
   },
+  "savings_intro": {
+    "button": {
+      "string": "Començar"
+    }
+  },
+  "savings_advanced": {
+    "total": {
+      "string": "Total seleccionat"
+    }
+  },
+  "transfer_success": {
+    "nav_title": {
+      "string": "Transferència realitzada"
+    }
+  },
   "error_channel_purchase": {
     "string": "Configuració de pagaments instantanis fallida"
   },
@@ -49,24 +66,6 @@
   "receiving_label": {
     "string": "Capacitat de recepció"
   },
-  "note_blocktank_limit": {
-    "string": "L'import que podeu transferir al vostre saldo de despeses està actualment limitat a ${usdValue}."
-  },
-  "quick_setup": {
-    "string": "Configuració ràpida"
-  },
-  "quick_confirm_header": {
-    "string": "Si us plau\n<accent>confirma</accent>"
-  },
-  "receiving_amount_money": {
-    "string": "Trieu la quantitat de diners que voleu poder rebre de forma immediata."
-  },
-  "receiving_amount_bitcoin": {
-    "string": "Introduïu la quantitat de Bitcoin que voleu poder rebre instantàniament."
-  },
-  "custom_confirm_header": {
-    "string": "Si us plau\n<accent>confirma</accent>"
-  },
   "setting_up_step2": {
     "string": "Pagament realitzat amb èxit"
   },
@@ -79,12 +78,6 @@
   "setting_up_button": {
     "string": "Continua utilitzant Bitkit"
   },
-  "interrupted_title": {
-    "string": "Transferència interrompuda"
-  },
-  "availability_title": {
-    "string": "Disponibilitat de fons"
-  },
   "node_info": {
     "string": "Node de Lightning"
   },
diff --git a/src/utils/i18n/locales/cs/cards.json b/src/utils/i18n/locales/cs/cards.json
index 784943118..fc61a1ca0 100644
--- a/src/utils/i18n/locales/cs/cards.json
+++ b/src/utils/i18n/locales/cs/cards.json
@@ -73,7 +73,7 @@
   },
   "transferClosingChannel": {
     "title": {
-      "string": "Inicializace..."
+      "string": "Zahájení"
     },
     "description": {
       "string": "Nechte aplikaci otevřenou"
diff --git a/src/utils/i18n/locales/cs/common.json b/src/utils/i18n/locales/cs/common.json
index c848c2bd5..00ef319de 100644
--- a/src/utils/i18n/locales/cs/common.json
+++ b/src/utils/i18n/locales/cs/common.json
@@ -88,5 +88,14 @@
   },
   "connect": {
     "string": "Připojit"
+  },
+  "min": {
+    "string": "Min"
+  },
+  "max": {
+    "string": "Max"
+  },
+  "default": {
+    "string": "Výchozí"
   }
 }
diff --git a/src/utils/i18n/locales/cs/lightning.json b/src/utils/i18n/locales/cs/lightning.json
index f9d723bb3..299e20fe6 100644
--- a/src/utils/i18n/locales/cs/lightning.json
+++ b/src/utils/i18n/locales/cs/lightning.json
@@ -1,5 +1,5 @@
 {
-  "introduction": {
+  "transfer_intro": {
     "title": {
       "string": "Disponibilní\n<accent>Zůstatek</accent>"
     },
@@ -48,32 +48,22 @@
     "nav_title": {
       "string": "Převést prostředky"
     },
-    "nav_successful": {
-      "string": "Přenos úspěšný"
-    },
-    "title_slider": {
-      "string": "Zůstatek\n<accent>vaše prostředky</accent>"
-    },
-    "title_numpad": {
-      "string": "Disponibilní <accent>Zůstatek</accent> "
-    },
-    "title_receive": {
-      "string": "Příchozí <accent>Kapacita</accent>"
-    },
-    "text_slider": {
-      "string": "Vyberte, kolik peněz chcete mít k dispozici k okamžitému utrácení a kolik chcete uspořit."
-    },
-    "text_numpad": {
-      "string": "Zadejte částku, kterou chcete mít k okamžitým platbám."
+    "confirm": {
+      "string": "Prosím,\n<accent>potvrďte</accent>"
     },
     "swipe": {
       "string": "Přejeďte prstem k provedení převodu"
+    }
+  },
+  "spending_intro": {
+    "title": {
+      "string": "Převést\n<accent>do výdajů</accent>"
     },
-    "error_min_amount": {
-      "string": "Částka na výdaje musí být alespoň ₿ {amount}"
+    "text": {
+      "string": "Převeďte peníze na svůj disponibilní zůstatek a využívejte okamžité a levné transakce s přáteli, rodinou a obchodníky."
     },
-    "error_max_amount": {
-      "string": "Částka na výdaje musí být menší než ₿ {amount}"
+    "button": {
+      "string": "Začít"
     }
   },
   "transfer_failed": {
@@ -93,6 +83,132 @@
       "string": "Zkusit znovu"
     }
   },
+  "spending_amount": {
+    "title": {
+      "string": "Převést\n<accent>do výdajů</accent>"
+    },
+    "quarter": {
+      "string": "25%"
+    },
+    "error_max": {
+      "title": {
+        "string": "Maximální disponibilní zůstatek"
+      },
+      "description": {
+        "string": "Částka, kterou můžete převést na svůj disponibilní zůstatek, je v současné době omezena na ₿ {amount}."
+      }
+    }
+  },
+  "spending_confirm": {
+    "network_fee": {
+      "string": "Síťové poplatky"
+    },
+    "lsp_fee": {
+      "string": "Poplatky za služby"
+    },
+    "amount": {
+      "string": "Do výdajů"
+    },
+    "total": {
+      "string": "Celkem"
+    },
+    "default": {
+      "string": "Použití výchozích nastavení"
+    }
+  },
+  "spending_advanced": {
+    "title": {
+      "string": "Příjímací\n<accent>kapacita</accent>"
+    },
+    "fee": {
+      "string": "Poplatek za likviditu"
+    }
+  },
+  "liquidity": {
+    "title": {
+      "string": "Likvidita\n<accent>& routing</accent>"
+    },
+    "text": {
+      "string": "Váš disponibilní zůstatek v síti Bitkit je jako vaše internetové připojení. Místo šířky pásma platíte za likviditu a směrování plateb.\n\nPlatby na váš disponibilní zůstatek a z něj jsou levnější, rychlejší a soukromější než běžné bitcoinové transakce.\n\nSíťový poplatek a poplatek poskytovateli služeb jsou jednorázové náklady na zřízení vašeho zůstatku."
+    },
+    "label": {
+      "string": "Likvidita disponibilního zůstatku"
+    }
+  },
+  "savings_intro": {
+    "title": {
+      "string": "Převést\n<accent>do úspor</accent>"
+    },
+    "text": {
+      "string": "Převeďte si disponibilní zůstatek na spoření, abyste si Bitcoiny uložili na delší dobu a zajistili si budoucnost."
+    },
+    "button": {
+      "string": "Začít"
+    }
+  },
+  "availability": {
+    "title": {
+      "string": "Finanční prostředky\n<accent>dostupnost</accent>"
+    },
+    "text": {
+      "string": "Převod peněz na spořicí účet je obvykle okamžitý, ale za určitých síťových podmínek může vypořádání trvat až <accent>14 dní</accent>."
+    }
+  },
+  "savings_confirm": {
+    "label": {
+      "string": "Převést do úspor"
+    },
+    "transfer_all": {
+      "string": "Převést vše"
+    }
+  },
+  "savings_advanced": {
+    "title": {
+      "string": "Vyberte prostředky\n<accent>k převodu</accent>"
+    },
+    "text": {
+      "string": "Část disponibilního zůstatku můžete převést na spoření, protože máte více aktivních lightning připojení."
+    },
+    "total": {
+      "string": "Celkem vybráno"
+    }
+  },
+  "savings_progress": {
+    "title": {
+      "string": "Finanční prostředky\n<accent>v převodu</accent>"
+    },
+    "text": {
+      "string": "Počkejte prosím, probíhá převod finančních prostředků. To by mělo trvat <accent>±10 sekund.</accent>"
+    }
+  },
+  "savings_interrupted": {
+    "nav_title": {
+      "string": "Převod\n<accent>přerušen</accent>"
+    },
+    "title": {
+      "string": "Ponechte Bitkit\n<accent>otevřený</accent>"
+    },
+    "text": {
+      "string": "Prostředky dosud nebyly převedeny. Bitkit se pokusí převod iniciovat během následujících <accent>30 minut</accent>. Nechte prosím aplikaci otevřenou."
+    }
+  },
+  "transfer_success": {
+    "nav_title": {
+      "string": "Přenos úspěšný"
+    },
+    "title_spending": {
+      "string": "Prostředky převedeny\n<accent>do výdajů</accent>"
+    },
+    "text_spending": {
+      "string": "Vaše prostředky byly převedeny a disponibilní zůstatek je připraven k použití."
+    },
+    "title_savings": {
+      "string": "Prostředky převedeny\n<accent>do úspor</accent>"
+    },
+    "text_savings": {
+      "string": "Vaše prostředky byly převedeny. Tyto prostředky můžete okamžitě použít."
+    }
+  },
   "error_channel_purchase": {
     "string": "Nastavení okamžitých plateb se nezdařilo"
   },
@@ -102,9 +218,6 @@
   "error_channel_receiving": {
     "string": "Přijímaná částka musí být vyšší než ${usdValue}"
   },
-  "enter_money": {
-    "string": "Zadejte množství bitcoinů, kterou chcete mít možnost okamžitě utratit."
-  },
   "spending": {
     "string": "Útraty"
   },
@@ -114,60 +227,9 @@
   "spending_label": {
     "string": "Disponibilní zůstatek"
   },
-  "spending_label_additional": {
-    "string": "Dodatečný disponibilní zůstatek"
-  },
   "receiving_label": {
     "string": "Kapacita příjmu"
   },
-  "receiving_label_additional": {
-    "string": "Dodatečná přijímací kapacita"
-  },
-  "note_blocktank_limit": {
-    "string": "Částka, kterou můžete převést na svůj disponibilní zůstatek, je aktuálně omezena na ${usdValue}."
-  },
-  "note_reserve_limit": {
-    "string": "Částka, kterou můžete převést na svůj disponibilní zůstatek, je omezena na {percentage}%. Abyste mohli tyto bitcoiny přesunout zpět na spořicí účet, musíte si ponechat finanční prostředky v rezervě."
-  },
-  "quick_setup": {
-    "string": "Rychlé nastavení"
-  },
-  "quick_confirm_header": {
-    "string": "Prosím,\n<accent>potvrďte</accent>"
-  },
-  "quick_confirm_cost": {
-    "string": "Stojí to <accent>{txFee}</accent> na síťových poplatcích a <accent>{lspFee}</accent> na poplatky poskytovateli služeb za převod vašich prostředků."
-  },
-  "spending_amount_bitcoin": {
-    "string": "Zvolte si, kolik peněz chcete mít možnost utrácet okamžitě."
-  },
-  "receiving_amount_money": {
-    "string": "Vyberte si, kolik peněz chcete být schopni přijímat okamžitě."
-  },
-  "receiving_amount_bitcoin": {
-    "string": "Zadejte množství bitcoinů, které chcete být schopni přijímat okamžitě."
-  },
-  "cost": {
-    "string": "(Náklady: {amount})"
-  },
-  "enter_custom_amount": {
-    "string": "Zadejte částku"
-  },
-  "custom_confirm_header": {
-    "string": "Prosím,\n<accent>potvrďte</accent>"
-  },
-  "custom_confirm_cost": {
-    "string": "Stojí to <accent>{txFee}</accent> na síťových poplatcích a <accent>{lspFee}</accent> poplatcích poskytovateli služeb za převod vašich prostředků. Váš zůstatek na účtu by měl zůstat aktivní alespoň po dobu <accentWithKeyboard>{weeks, plural, one {# week} další {# weeks}</accentWithKeyboard> }. <accentWithKeyboard><penIcon/></accentWithKeyboard>"
-  },
-  "duration_header": {
-    "string": "Zůstatek <accent>doba trvání</accent>"
-  },
-  "duration_text": {
-    "string": "Zvolte si minimální počet týdnů, po které má být tato část vašeho disponibilního zůstatku (kanál Lightning) aktivní."
-  },
-  "duration_week": {
-    "string": "{count, plural, one {týden} few {týdny} many {týdny} other {týdnů}}"
-  },
   "setting_up_header": {
     "string": "V převodu"
   },
@@ -189,39 +251,6 @@
   "setting_up_button": {
     "string": "Pokračujte v používání Bitkit"
   },
-  "result_header": {
-    "string": "<accent>Připraveno</accent>"
-  },
-  "result_text": {
-    "string": "Vaše prostředky byly převedeny a disponibilní zůstatek je připraven k použití."
-  },
-  "timeout_header": {
-    "string": "<accent>Ponechte Bitkit</accent>\notevřený"
-  },
-  "timeout_text": {
-    "string": "Prostředky dosud nebyly převedeny. Bitkit se pokusí převod iniciovat během následujících <accent>30 minut</accent>. Nechte prosím aplikaci otevřenou."
-  },
-  "transfer_close": {
-    "string": "Převod disponibilního zůstatku zpět na spoření vyžaduje síťový poplatek. Přesná výše poplatku závisí na podmínkách sítě."
-  },
-  "ts_savings_title": {
-    "string": "Převést\n<accent>do úspor</accent>"
-  },
-  "ts_savings_text": {
-    "string": "Vaše prostředky byly převedeny na spořicí účet. Tyto prostředky můžete okamžitě použít."
-  },
-  "interrupted_title": {
-    "string": "Přenos přerušen"
-  },
-  "availability_title": {
-    "string": "Dostupnost prostředků"
-  },
-  "availability_header": {
-    "string": "Dostupnost\n<accent>prostředků</accent>"
-  },
-  "availability_text": {
-    "string": "Převod peněz na spořicí účet je obvykle okamžitý, ale za určitých síťových podmínek může vypořádání trvat až <accent>14 dní</accent>."
-  },
   "node_info": {
     "string": "Lightning uzel"
   },
@@ -357,6 +386,12 @@
   "channel_node_id": {
     "string": "ID uzlu"
   },
+  "channel_id": {
+    "string": "ID kanálu"
+  },
+  "channel_point": {
+    "string": "Bod kanálu"
+  },
   "closure_reason": {
     "string": "Důvod uzavření"
   },
@@ -368,7 +403,7 @@
       "string": "Připojení uzavřeno"
     },
     "description": {
-      "string": "Vaše připojení lightning bylo uzavřeno. Vaše prostředky byly převedeny na vaše spoření."
+      "string": "Prostředky z vašeho disponibilního zůstatku byly převedeny do úspor."
     }
   },
   "close_conn": {
diff --git a/src/utils/i18n/locales/cs/other.json b/src/utils/i18n/locales/cs/other.json
index 230c5bce0..d16ecd993 100644
--- a/src/utils/i18n/locales/cs/other.json
+++ b/src/utils/i18n/locales/cs/other.json
@@ -276,5 +276,13 @@
   },
   "try_again": {
     "string": "Zkuste to prosím znovu."
+  },
+  "transfer_notification": {
+    "title": {
+      "string": "Důležité: Přenos BitKit"
+    },
+    "body": {
+      "string": "Otevřete Bitkit pro dokončení přenosu"
+    }
   }
 }
diff --git a/src/utils/i18n/locales/el/cards.json b/src/utils/i18n/locales/el/cards.json
index dce9aa911..428b052ef 100644
--- a/src/utils/i18n/locales/el/cards.json
+++ b/src/utils/i18n/locales/el/cards.json
@@ -16,9 +16,6 @@
     }
   },
   "transferClosingChannel": {
-    "title": {
-      "string": "Έναρξη..."
-    },
     "description": {
       "string": "Κρατήστε την εφαρμογή ανοιχτή"
     }
diff --git a/src/utils/i18n/locales/es_419/cards.json b/src/utils/i18n/locales/es_419/cards.json
index b88430f9a..0780a5cd7 100644
--- a/src/utils/i18n/locales/es_419/cards.json
+++ b/src/utils/i18n/locales/es_419/cards.json
@@ -60,9 +60,6 @@
     }
   },
   "transferClosingChannel": {
-    "title": {
-      "string": "Arrancando"
-    },
     "description": {
       "string": "Mantenga la aplicación abierta"
     }
diff --git a/src/utils/i18n/locales/es_419/lightning.json b/src/utils/i18n/locales/es_419/lightning.json
index 2e96e08cf..22839f033 100644
--- a/src/utils/i18n/locales/es_419/lightning.json
+++ b/src/utils/i18n/locales/es_419/lightning.json
@@ -1,5 +1,5 @@
 {
-  "introduction": {
+  "transfer_intro": {
     "button": {
       "string": "Empezar"
     }
@@ -13,21 +13,35 @@
     "nav_title": {
       "string": "Transferir fondos"
     },
-    "nav_successful": {
-      "string": "Transferencia exitosa"
-    },
-    "text_numpad": {
-      "string": "Introduzca la cantidad de dinero que desea poder gastar al instante."
-    },
     "swipe": {
       "string": "Deslizar para transferir"
     }
   },
+  "spending_intro": {
+    "button": {
+      "string": "Empezar"
+    }
+  },
   "transfer_failed": {
     "continue": {
       "string": "Inténtelo de nuevo"
     }
   },
+  "savings_intro": {
+    "button": {
+      "string": "Empezar"
+    }
+  },
+  "savings_advanced": {
+    "total": {
+      "string": "Total seleccionado"
+    }
+  },
+  "transfer_success": {
+    "nav_title": {
+      "string": "Transferencia exitosa"
+    }
+  },
   "error_channel_purchase": {
     "string": "Falló la Configuración de Pagos Instantáneos"
   },
@@ -43,30 +57,12 @@
   "receiving_label": {
     "string": "Capacidad de recepción"
   },
-  "note_blocktank_limit": {
-    "string": "El importe que puede transferir a su saldo de gastos está limitado actualmente a ${usdValue}."
-  },
-  "quick_setup": {
-    "string": "Configuración rápida"
-  },
-  "receiving_amount_money": {
-    "string": "Elija cuánto dinero desea poder recibir al instante."
-  },
-  "receiving_amount_bitcoin": {
-    "string": "Introduzca la cantidad de Bitcoin que desea poder recibir al instante."
-  },
   "setting_up_step2": {
     "string": "Pago Efectuado"
   },
   "setting_up_step3": {
     "string": "En Cola Para la Apertura"
   },
-  "interrupted_title": {
-    "string": "Transferencia interrumpida"
-  },
-  "availability_title": {
-    "string": "Disponibilidad de fondos"
-  },
   "node_info": {
     "string": "Nodo Lightning"
   },
diff --git a/src/utils/i18n/locales/es_ES/cards.json b/src/utils/i18n/locales/es_ES/cards.json
index 4a4e3a638..2cf486429 100644
--- a/src/utils/i18n/locales/es_ES/cards.json
+++ b/src/utils/i18n/locales/es_ES/cards.json
@@ -31,9 +31,6 @@
     }
   },
   "transferClosingChannel": {
-    "title": {
-      "string": "Iniciando..."
-    },
     "description": {
       "string": "Mantenga abierta la app"
     }
diff --git a/src/utils/i18n/locales/es_ES/lightning.json b/src/utils/i18n/locales/es_ES/lightning.json
index 1a1c8a904..1d801ee9f 100644
--- a/src/utils/i18n/locales/es_ES/lightning.json
+++ b/src/utils/i18n/locales/es_ES/lightning.json
@@ -1,5 +1,5 @@
 {
-  "introduction": {
+  "transfer_intro": {
     "button": {
       "string": "Empezar"
     }
@@ -13,21 +13,35 @@
     "nav_title": {
       "string": "Transferir fondos"
     },
-    "nav_successful": {
-      "string": "Transferencia exitosa"
-    },
-    "text_numpad": {
-      "string": "Introduzca la cantidad de dinero que desea poder gastar al instante."
-    },
     "swipe": {
       "string": "Deslizar para transferir"
     }
   },
+  "spending_intro": {
+    "button": {
+      "string": "Empezar"
+    }
+  },
   "transfer_failed": {
     "continue": {
       "string": "Inténtelo de nuevo"
     }
   },
+  "savings_intro": {
+    "button": {
+      "string": "Empezar"
+    }
+  },
+  "savings_advanced": {
+    "total": {
+      "string": "Total seleccionado"
+    }
+  },
+  "transfer_success": {
+    "nav_title": {
+      "string": "Transferencia exitosa"
+    }
+  },
   "error_channel_purchase": {
     "string": "Error en la Configuración de Pago Instántaneo"
   },
@@ -46,24 +60,6 @@
   "receiving_label": {
     "string": "Capacidad de recepción"
   },
-  "note_blocktank_limit": {
-    "string": "La cantidad que puedes transferir a tu balance de gastos está actualmente limitada a $ 1 {usdValue}"
-  },
-  "quick_setup": {
-    "string": "Configuración rápida"
-  },
-  "receiving_amount_money": {
-    "string": "Elija cuánto dinero desea poder recibir al instante."
-  },
-  "receiving_amount_bitcoin": {
-    "string": "Introduzca la cantidad de Bitcoin que desea poder recibir al instante."
-  },
-  "interrupted_title": {
-    "string": "Transferencia interrumpida"
-  },
-  "availability_title": {
-    "string": "Disponibilidad de fondos"
-  },
   "node_id": {
     "string": "ID del nodo LDK"
   },
diff --git a/src/utils/i18n/locales/fr/cards.json b/src/utils/i18n/locales/fr/cards.json
index 07e9e02b2..5867498f7 100644
--- a/src/utils/i18n/locales/fr/cards.json
+++ b/src/utils/i18n/locales/fr/cards.json
@@ -69,9 +69,6 @@
     }
   },
   "transferClosingChannel": {
-    "title": {
-      "string": "Démarrage..."
-    },
     "description": {
       "string": "Maintenir l'application ouverte"
     }
diff --git a/src/utils/i18n/locales/fr/common.json b/src/utils/i18n/locales/fr/common.json
index fa1e6c98b..d4687e380 100644
--- a/src/utils/i18n/locales/fr/common.json
+++ b/src/utils/i18n/locales/fr/common.json
@@ -85,5 +85,8 @@
   },
   "connect": {
     "string": "Connecter"
+  },
+  "default": {
+    "string": "Défaut"
   }
 }
diff --git a/src/utils/i18n/locales/fr/lightning.json b/src/utils/i18n/locales/fr/lightning.json
index 889a26eef..79db01edf 100644
--- a/src/utils/i18n/locales/fr/lightning.json
+++ b/src/utils/i18n/locales/fr/lightning.json
@@ -1,5 +1,5 @@
 {
-  "introduction": {
+  "transfer_intro": {
     "title": {
       "string": "Compte de dépenses\n<accent>Solde</accent>"
     },
@@ -48,32 +48,16 @@
     "nav_title": {
       "string": "Transfert de fonds"
     },
-    "nav_successful": {
-      "string": "Transfert réussi"
-    },
-    "title_slider": {
-      "string": "Équilibrer\n<accent>vos fonds</accent>"
-    },
-    "title_numpad": {
-      "string": "<accent>Solde</accent> du compte de dépenses"
-    },
-    "title_receive": {
-      "string": "<accent>Capacité</accent> de réception"
-    },
-    "text_slider": {
-      "string": "Choisissez le montant que vous souhaitez pouvoir dépenser immédiatement et combien vous souhaitez conserver en épargne."
-    },
-    "text_numpad": {
-      "string": "Saisissez le montant que vous souhaitez pouvoir dépenser instantanément."
+    "confirm": {
+      "string": "Veuillez\n<accent>confirmer</accent>"
     },
     "swipe": {
       "string": "Glissez pour transférer"
-    },
-    "error_min_amount": {
-      "string": "Le montant des dépenses doit être d'au moins ₿ {amount}"
-    },
-    "error_max_amount": {
-      "string": "Le montant des dépenses doit être inférieur à ₿ {amount}"
+    }
+  },
+  "spending_intro": {
+    "button": {
+      "string": "Commencer"
     }
   },
   "transfer_failed": {
@@ -93,6 +77,34 @@
       "string": "Réessayer"
     }
   },
+  "savings_intro": {
+    "button": {
+      "string": "Commencer"
+    }
+  },
+  "availability": {
+    "text": {
+      "string": "Le transfert de fonds vers l'épargne est généralement instantané, mais la transaction peut prendre jusqu'à <accent>14 jours</accent> dans certaines conditions de réseau."
+    }
+  },
+  "savings_advanced": {
+    "total": {
+      "string": "Total sélectionné"
+    }
+  },
+  "savings_interrupted": {
+    "text": {
+      "string": "Les fonds n'ont pas encore été transférés. Bitkit va essayer d'initier le transfert au cours des <accent>30</accent> prochaines <accent>minutes</accent>. Veuillez garder votre application ouverte."
+    }
+  },
+  "transfer_success": {
+    "nav_title": {
+      "string": "Transfert réussi"
+    },
+    "text_spending": {
+      "string": "Vos fonds ont été transférés et votre solde de dépenses est prêt à être utilisé."
+    }
+  },
   "error_channel_purchase": {
     "string": "Échec de la configuration des paiements instantanés"
   },
@@ -102,9 +114,6 @@
   "error_channel_receiving": {
     "string": "Le montant reçu doit être supérieur à $.{usdValue}"
   },
-  "enter_money": {
-    "string": "Saisissez le montant de bitcoins que vous souhaitez pouvoir dépenser instantanément."
-  },
   "spending": {
     "string": "Dépenser"
   },
@@ -114,57 +123,9 @@
   "spending_label": {
     "string": "Solde du compte de dépenses"
   },
-  "spending_label_additional": {
-    "string": "Solde du compte de dépenses"
-  },
   "receiving_label": {
     "string": "Capacité de réception"
   },
-  "receiving_label_additional": {
-    "string": "Capacité de réception supplémentaire"
-  },
-  "note_blocktank_limit": {
-    "string": "Le montant que vous pouvez transférer vers votre solde du compte de dépenses est actuellement limité à ${usdValue}."
-  },
-  "note_reserve_limit": {
-    "string": "Le montant que vous pouvez transférer vers votre compte courant est limité à {percentage}%. Vous devez garder des fonds en réserve pour transférer ce bitcoin vers l'épargne."
-  },
-  "quick_setup": {
-    "string": "Configuration rapide"
-  },
-  "quick_confirm_header": {
-    "string": "Veuillez\n<accent>confirmer</accent>"
-  },
-  "quick_confirm_cost": {
-    "string": "Il coûte <accent>{txFee}</accent> de frais de réseau et <accent>{lspFee}</accent> de frais de fournisseur de services pour le transfert de vos fonds."
-  },
-  "spending_amount_bitcoin": {
-    "string": "Choisissez le montant que vous souhaitez pouvoir dépenser instantanément."
-  },
-  "receiving_amount_money": {
-    "string": "Choisissez le montant de bitcoins que vous souhaitez recevoir instantanément."
-  },
-  "receiving_amount_bitcoin": {
-    "string": "Saisissez le montant de bitcoins que vous souhaitez recevoir instantanément."
-  },
-  "enter_custom_amount": {
-    "string": "Entrez le montant"
-  },
-  "custom_confirm_header": {
-    "string": "Veuillez\n<accent>confirmer</accent>"
-  },
-  "custom_confirm_cost": {
-    "string": "Il coûte <accent>{txFee}</accent> de frais de réseau et <accent>{lspFee}</accent> de frais de fournisseur de services pour le transfert de vos fonds. Votre solde du compte courant doit rester actif pendant au moins <accentWithKeyboard>{weeks, plural, one {# week} other {# weeks}</accentWithKeyboard> }. <accentWithKeyboard><penIcon/></accentWithKeyboard>"
-  },
-  "duration_header": {
-    "string": "<accent>Durée</accent> du solde"
-  },
-  "duration_text": {
-    "string": "Choisissez le nombre minimum de semaines pendant lesquelles vous souhaitez que cette partie de votre solde du compte courant (Lightning Channel) reste active."
-  },
-  "duration_week": {
-    "string": "{count, plural, one {semaine} many {semaines} other {semaines}}"
-  },
   "setting_up_header": {
     "string": "En transfert"
   },
@@ -186,39 +147,6 @@
   "setting_up_button": {
     "string": "Continuer à utiliser Bitkit"
   },
-  "result_header": {
-    "string": "<accent>Prêt</accent>"
-  },
-  "result_text": {
-    "string": "Vos fonds ont été transférés et votre solde de dépenses est prêt à être utilisé."
-  },
-  "timeout_header": {
-    "string": "<accent>Gardez Bitkit</accent>\nouvert"
-  },
-  "timeout_text": {
-    "string": "Les fonds n'ont pas encore été transférés. Bitkit va essayer d'initier le transfert au cours des <accent>30</accent> prochaines <accent>minutes</accent>. Veuillez garder votre application ouverte."
-  },
-  "transfer_close": {
-    "string": "Le transfert du solde de votre compte courant vers votre compte d'épargne est soumis à des frais de réseau. Le montant exact des frais dépend des conditions du réseau."
-  },
-  "ts_savings_title": {
-    "string": "Transfert\n<accent>vers l'épargne</accent>"
-  },
-  "ts_savings_text": {
-    "string": "Vos fonds ont été transférés sur votre épargne. Vous pouvez utiliser ces fonds immédiatement."
-  },
-  "interrupted_title": {
-    "string": "Transfert interrompu"
-  },
-  "availability_title": {
-    "string": "Fonds disponibles"
-  },
-  "availability_header": {
-    "string": "Disponibilité\n<accent>des fonds</accent>"
-  },
-  "availability_text": {
-    "string": "Le transfert de fonds vers l'épargne est généralement instantané, mais la transaction peut prendre jusqu'à <accent>14 jours</accent> dans certaines conditions de réseau."
-  },
   "node_info": {
     "string": "Nœud Lightning"
   },
@@ -336,9 +264,6 @@
   "connection_closed": {
     "title": {
       "string": "Connexion fermée"
-    },
-    "description": {
-      "string": "Votre connection Lightning est fermée. Vos fonds ont été transférés sur votre épargne."
     }
   },
   "close_conn": {
diff --git a/src/utils/i18n/locales/it/cards.json b/src/utils/i18n/locales/it/cards.json
index 2a0c5fbf8..5fad1bf04 100644
--- a/src/utils/i18n/locales/it/cards.json
+++ b/src/utils/i18n/locales/it/cards.json
@@ -69,9 +69,6 @@
     }
   },
   "transferClosingChannel": {
-    "title": {
-      "string": "Inizializzazione..."
-    },
     "description": {
       "string": "Tieni l'app aperta"
     }
diff --git a/src/utils/i18n/locales/it/common.json b/src/utils/i18n/locales/it/common.json
index 1c4ab8380..f93bec1d5 100644
--- a/src/utils/i18n/locales/it/common.json
+++ b/src/utils/i18n/locales/it/common.json
@@ -85,5 +85,8 @@
   },
   "connect": {
     "string": "Connetti"
+  },
+  "default": {
+    "string": "Predefinito"
   }
 }
diff --git a/src/utils/i18n/locales/it/lightning.json b/src/utils/i18n/locales/it/lightning.json
index 131430854..044099e9a 100644
--- a/src/utils/i18n/locales/it/lightning.json
+++ b/src/utils/i18n/locales/it/lightning.json
@@ -1,5 +1,5 @@
 {
-  "introduction": {
+  "transfer_intro": {
     "title": {
       "string": "Conto\n<accent>di Spesa</accent>"
     },
@@ -48,32 +48,16 @@
     "nav_title": {
       "string": "Trasferimento Fondi"
     },
-    "nav_successful": {
-      "string": "Trasferimento Riuscito"
-    },
-    "title_slider": {
-      "string": "Bilancia\n<accent>i tuoi fondi</accent>"
-    },
-    "title_numpad": {
-      "string": "Conto <accent>di Spesa</accent>"
-    },
-    "title_receive": {
-      "string": "Capacità di <accent>Ricezione</accent>"
-    },
-    "text_slider": {
-      "string": "Scegli quanti soldi vuoi poter spendere istantaneamente e quanto vuoi conservare come risparmio."
-    },
-    "text_numpad": {
-      "string": "Inserisci l'importo che vuoi poter spendere istantaneamente."
+    "confirm": {
+      "string": "Per favore\n<accent>conferma</accent>"
     },
     "swipe": {
       "string": "Swipe Per Trasferire"
-    },
-    "error_min_amount": {
-      "string": "L'importo della spesa deve essere almeno ₿ {amount}"
-    },
-    "error_max_amount": {
-      "string": "L'importo della spesa deve essere inferiore a ₿ {amount}"
+    }
+  },
+  "spending_intro": {
+    "button": {
+      "string": "Inizia"
     }
   },
   "transfer_failed": {
@@ -93,6 +77,34 @@
       "string": "Riprova"
     }
   },
+  "savings_intro": {
+    "button": {
+      "string": "Inizia"
+    }
+  },
+  "availability": {
+    "text": {
+      "string": "Il trasferimento dei fondi al conto di risparmio è solitamente istantaneo, ma il pagamento potrebbe richiedere fino a <accent>14 giorni</accent> in determinate condizioni di rete."
+    }
+  },
+  "savings_advanced": {
+    "total": {
+      "string": "Totale selezionato"
+    }
+  },
+  "savings_interrupted": {
+    "text": {
+      "string": "I fondi non sono stati ancora trasferiti. Bitkit tenterà di avviare il trasferimento durante i prossimi <accent>30 minuti</accent>.  Per favore mantieni l'app aperta."
+    }
+  },
+  "transfer_success": {
+    "nav_title": {
+      "string": "Trasferimento Riuscito"
+    },
+    "text_spending": {
+      "string": "I tuoi fondi sono stati trasferiti e il tuo conto di spesa è pronto per essere utilizzato."
+    }
+  },
   "error_channel_purchase": {
     "string": "Configurazione dei Pagamenti Istantanei Fallita"
   },
@@ -102,9 +114,6 @@
   "error_channel_receiving": {
     "string": "L'importo da ricevere deve essere maggiore di ${usdValue}."
   },
-  "enter_money": {
-    "string": "Inserisci la quantità di bitcoin che desideri poter spendere istantaneamente."
-  },
   "spending": {
     "string": "Spesa"
   },
@@ -114,60 +123,9 @@
   "spending_label": {
     "string": "Conto di spesa"
   },
-  "spending_label_additional": {
-    "string": "Conto di spesa aggiuntivo"
-  },
   "receiving_label": {
     "string": "Capacità di ricezione"
   },
-  "receiving_label_additional": {
-    "string": "Capacità di ricezione aggiuntiva"
-  },
-  "note_blocktank_limit": {
-    "string": "L'importo che puoi trasferire al tuo conto di spesa è attualmente limitato a ${usdValue}."
-  },
-  "note_reserve_limit": {
-    "string": "L'importo che puoi trasferire sul tuo conto di spesa è limitato al {percentage}%. È necessario tenere i fondi di riserva per riportare questi bitcoin nei risparmi."
-  },
-  "quick_setup": {
-    "string": "Configurazione Rapida"
-  },
-  "quick_confirm_header": {
-    "string": "Per favore\n<accent>conferma</accent>"
-  },
-  "quick_confirm_cost": {
-    "string": "Il trasferimento dei fondi costa <accent>{txFee}</accent> in commissioni di rete e <accent>{lspFee}</accent> in commissioni del fornitore dei servizi."
-  },
-  "spending_amount_bitcoin": {
-    "string": "Scegli quanti soldi vuoi poter spendere istantaneamente."
-  },
-  "receiving_amount_money": {
-    "string": "Scegli la quantità di soldi che vuoi ricevere istantaneamente."
-  },
-  "receiving_amount_bitcoin": {
-    "string": "Inserisci l'importo di Bitcoin che vuoi ricevere istantaneamente."
-  },
-  "cost": {
-    "string": "(Costo: {amount})"
-  },
-  "enter_custom_amount": {
-    "string": "Inserire l'importo"
-  },
-  "custom_confirm_header": {
-    "string": "Per favore\n<accent>conferma</accent>"
-  },
-  "custom_confirm_cost": {
-    "string": "Il trasferimento dei fondi comporta un costo di <accent>{txFee}</accent> in commissioni di rete e <accent>{lspFee}</accent> in commissioni del fornitore di servizi. Il tuo conto di spesa dovrebbe rimanere attivo per almeno altri <accentWithKeyboard>{weeks, plural, one {# week} o {# weeks}}.<penIcon/></accentWithKeyboard>"
-  },
-  "duration_header": {
-    "string": "Saldo <accent>durata</accent>"
-  },
-  "duration_text": {
-    "string": "Scegli il numero minimo di settimane in cui desideri che questa parte del tuo conto di spesa (Canale Lightning) rimanga attiva."
-  },
-  "duration_week": {
-    "string": "{count, plural, one {settimane} many {Tuo nome} other {settimane}}"
-  },
   "setting_up_header": {
     "string": "In trasferimento"
   },
@@ -189,39 +147,6 @@
   "setting_up_button": {
     "string": "Continua ad utilizzare Bitkit"
   },
-  "result_header": {
-    "string": "<accent>Pronto</accent>"
-  },
-  "result_text": {
-    "string": "I tuoi fondi sono stati trasferiti e il tuo conto di spesa è pronto per essere utilizzato."
-  },
-  "timeout_header": {
-    "string": "<accent>Mantieni Bitkit</accent>aperto"
-  },
-  "timeout_text": {
-    "string": "I fondi non sono stati ancora trasferiti. Bitkit tenterà di avviare il trasferimento durante i prossimi <accent>30 minuti</accent>.  Per favore mantieni l'app aperta."
-  },
-  "transfer_close": {
-    "string": "Il trasferimento del tuo conto di spesa al tuo conto di risparmio richiede una commissione di rete. La tariffa esatta dipende dalle condizioni della rete."
-  },
-  "ts_savings_title": {
-    "string": "Transferimento\n<accent>a Risparmi</accent>"
-  },
-  "ts_savings_text": {
-    "string": "I tuoi fondi sono stati trasferiti ai tuoi risparmi. Puoi utilizzare questi fondi immediatamente."
-  },
-  "interrupted_title": {
-    "string": "Trasferimento Interrotto"
-  },
-  "availability_title": {
-    "string": "Disponibilità Fondi"
-  },
-  "availability_header": {
-    "string": "Disponibilità\n<accent>dei fondi</accent>"
-  },
-  "availability_text": {
-    "string": "Il trasferimento dei fondi al conto di risparmio è solitamente istantaneo, ma il pagamento potrebbe richiedere fino a <accent>14 giorni</accent> in determinate condizioni di rete."
-  },
   "node_info": {
     "string": "Nodo Lightning"
   },
@@ -351,9 +276,6 @@
   "connection_closed": {
     "title": {
       "string": "Connessione chiusa"
-    },
-    "description": {
-      "string": "La tua connessione Lightning è stata chiusa. I tuoi fondi sono stati trasferiti ai tuoi risparmi."
     }
   },
   "close_conn": {
diff --git a/src/utils/i18n/locales/nl/cards.json b/src/utils/i18n/locales/nl/cards.json
index e36f7ab3a..ff2afdc23 100644
--- a/src/utils/i18n/locales/nl/cards.json
+++ b/src/utils/i18n/locales/nl/cards.json
@@ -69,9 +69,6 @@
     }
   },
   "transferClosingChannel": {
-    "title": {
-      "string": "Aan het opstarten..."
-    },
     "description": {
       "string": "Houd de app open"
     }
diff --git a/src/utils/i18n/locales/nl/lightning.json b/src/utils/i18n/locales/nl/lightning.json
index 4ba25d6b3..a72a28198 100644
--- a/src/utils/i18n/locales/nl/lightning.json
+++ b/src/utils/i18n/locales/nl/lightning.json
@@ -1,5 +1,5 @@
 {
-  "introduction": {
+  "transfer_intro": {
     "title": {
       "string": "Bestedings\n<accent>Saldo</accent>"
     },
@@ -45,19 +45,15 @@
     "nav_title": {
       "string": "Geld Overboeken"
     },
-    "nav_successful": {
-      "string": "Overboeking Voltooid"
-    },
-    "title_slider": {
-      "string": "Geld\n<accent>overmaken</accent>"
-    },
-    "text_numpad": {
-      "string": "Voer het bedrag in wat uw direct wenst te kunnen uitgeven"
-    },
     "swipe": {
       "string": "Veeg om over te boeken"
     }
   },
+  "spending_intro": {
+    "button": {
+      "string": "Starten"
+    }
+  },
   "transfer_failed": {
     "nav_title": {
       "string": "Overboeking Mislukt"
@@ -72,6 +68,34 @@
       "string": "Opnieuw proberen"
     }
   },
+  "savings_intro": {
+    "button": {
+      "string": "Starten"
+    }
+  },
+  "availability": {
+    "text": {
+      "string": "Geld overmaken naar uw spaarsaldo is meestal direct, maar de overboeking kan tot <accent>14 dagen</accent> duren onder bepaalde netwerkvoorwaarden."
+    }
+  },
+  "savings_advanced": {
+    "total": {
+      "string": "Totaal geselecteerd"
+    }
+  },
+  "savings_interrupted": {
+    "text": {
+      "string": "Het geld is nog niet overgeboekt. Bitkit zal proberen de overboeking gedurende<accent>30 minuten</accent> te initiëren. Houd uw app open."
+    }
+  },
+  "transfer_success": {
+    "nav_title": {
+      "string": "Overboeking Voltooid"
+    },
+    "text_spending": {
+      "string": "Uw geld is overgeboekt en uw bestedingssaldo is klaar voor gebruik."
+    }
+  },
   "error_channel_purchase": {
     "string": "Directe Betalingen Instellen Mislukt"
   },
@@ -87,36 +111,9 @@
   "spending_label": {
     "string": "Bestedingssaldo"
   },
-  "spending_label_additional": {
-    "string": "Aanvullend Bestedingssaldo"
-  },
   "receiving_label": {
     "string": "Ontvangstcapaciteit"
   },
-  "note_blocktank_limit": {
-    "string": "De hoeveelheid die u momenteel kunt overboeken is maximaal {usdValue}"
-  },
-  "note_reserve_limit": {
-    "string": "Het bedrag dat u naar uw bestedingssaldo kunt overboeken is beperkt tot {percentage}%. U moet wat ₿ in reserve houden om de bitcoin terug te kunnen boeken naar uw spaartegoed."
-  },
-  "quick_setup": {
-    "string": "Snelle installatie"
-  },
-  "quick_confirm_cost": {
-    "string": "Het kost <accent>{txFee}</accent> aan netwerkkosten en <accent>{lspFee}</accent> aan servicekosten om uw geld over te boeken."
-  },
-  "receiving_amount_money": {
-    "string": "Kies hoeveel geld u direct wilt kunnen ontvangen. "
-  },
-  "receiving_amount_bitcoin": {
-    "string": "Geef de hoeveelheid bitcoin aan die u direct wilt kunnen ontvangen. "
-  },
-  "custom_confirm_cost": {
-    "string": "Het kost <accent>{txFee}</accent> aan netwerkkosten en <accent>{lspFee}</accent> aan servicekosten om uw geld over te boeken. Uw bestedingssaldo moet ten minste <accentWithKeyboard>{weeks, plural, one {# week} of {# weeks} <penIcon/>}</accentWithKeyboard> actief blijven."
-  },
-  "duration_week": {
-    "string": "{count, plural, one {week} other {weken}}"
-  },
   "setting_up_header": {
     "string": "Onderweg"
   },
@@ -132,30 +129,6 @@
   "setting_up_step4": {
     "string": "Verbinding Wordt Gereed Gemaakt"
   },
-  "result_text": {
-    "string": "Uw geld is overgeboekt en uw bestedingssaldo is klaar voor gebruik."
-  },
-  "timeout_text": {
-    "string": "Het geld is nog niet overgeboekt. Bitkit zal proberen de overboeking gedurende<accent>30 minuten</accent> te initiëren. Houd uw app open."
-  },
-  "transfer_close": {
-    "string": "Voor het terugboeken van uw bestedingssaldo naar uw spaarrekening worden netwerkkosten in rekening gebracht. De exacte kosten zijn afhankelijk van de drukte op het netwerk."
-  },
-  "ts_savings_title": {
-    "string": "Overmaken\n<accent>naar Spaargeld</accent>"
-  },
-  "ts_savings_text": {
-    "string": "Uw geld is overgeboekt naar uw spaarsaldo. U kunt dit geld onmiddellijk gebruiken."
-  },
-  "interrupted_title": {
-    "string": "Overdracht Onderbroken"
-  },
-  "availability_title": {
-    "string": "Beschikbare Balans"
-  },
-  "availability_text": {
-    "string": "Geld overmaken naar uw spaarsaldo is meestal direct, maar de overboeking kan tot <accent>14 dagen</accent> duren onder bepaalde netwerkvoorwaarden."
-  },
   "node_info": {
     "string": "Lightning Node"
   },
@@ -243,11 +216,6 @@
   "support": {
     "string": "Ondersteuning"
   },
-  "connection_closed": {
-    "description": {
-      "string": "Uw Lightning verbinding is gesloten. Uw geld is overgeboekt naar uw spaarsaldo."
-    }
-  },
   "close_conn": {
     "string": "Verbinding Sluiten"
   },
diff --git a/src/utils/i18n/locales/pl/cards.json b/src/utils/i18n/locales/pl/cards.json
index 67891c33c..dd5216b04 100644
--- a/src/utils/i18n/locales/pl/cards.json
+++ b/src/utils/i18n/locales/pl/cards.json
@@ -16,9 +16,6 @@
     }
   },
   "transferClosingChannel": {
-    "title": {
-      "string": "Instaluję"
-    },
     "description": {
       "string": "Pozostaw aplikację włączoną"
     }
diff --git a/src/utils/i18n/locales/pl/fee.json b/src/utils/i18n/locales/pl/fee.json
index 0967ef424..e9d569a9d 100644
--- a/src/utils/i18n/locales/pl/fee.json
+++ b/src/utils/i18n/locales/pl/fee.json
@@ -1 +1,13 @@
-{}
+{
+  "custom": {
+    "description": {
+      "string": "Zależy od opłaty"
+    },
+    "shortRange": {
+      "string": "Zależy od opłaty"
+    },
+    "shortDescription": {
+      "string": "Zależy od opłaty"
+    }
+  }
+}
diff --git a/src/utils/i18n/locales/pl/lightning.json b/src/utils/i18n/locales/pl/lightning.json
index 60a8ce288..42fa37e6f 100644
--- a/src/utils/i18n/locales/pl/lightning.json
+++ b/src/utils/i18n/locales/pl/lightning.json
@@ -4,9 +4,6 @@
       "string": "Spróbuj ponownie"
     }
   },
-  "quick_setup": {
-    "string": "Szybka konfiguracja"
-  },
   "channel_node_id": {
     "string": "ID węzła"
   },
diff --git a/src/utils/i18n/locales/pt_BR/cards.json b/src/utils/i18n/locales/pt_BR/cards.json
index 05d317a12..da4325215 100644
--- a/src/utils/i18n/locales/pt_BR/cards.json
+++ b/src/utils/i18n/locales/pt_BR/cards.json
@@ -72,9 +72,6 @@
     }
   },
   "transferClosingChannel": {
-    "title": {
-      "string": "Iniciando..."
-    },
     "description": {
       "string": "Mantenha o app aberto"
     }
diff --git a/src/utils/i18n/locales/pt_BR/common.json b/src/utils/i18n/locales/pt_BR/common.json
index 91af9515b..e0098351c 100644
--- a/src/utils/i18n/locales/pt_BR/common.json
+++ b/src/utils/i18n/locales/pt_BR/common.json
@@ -85,5 +85,8 @@
   },
   "connect": {
     "string": "Conectar"
+  },
+  "default": {
+    "string": "Padrão"
   }
 }
diff --git a/src/utils/i18n/locales/pt_BR/lightning.json b/src/utils/i18n/locales/pt_BR/lightning.json
index 4b2b52947..a9fba6086 100644
--- a/src/utils/i18n/locales/pt_BR/lightning.json
+++ b/src/utils/i18n/locales/pt_BR/lightning.json
@@ -1,5 +1,5 @@
 {
-  "introduction": {
+  "transfer_intro": {
     "title": {
       "string": "Saldo de\n<accent>Gastos</accent>"
     },
@@ -48,32 +48,16 @@
     "nav_title": {
       "string": "Transferência de fundos"
     },
-    "nav_successful": {
-      "string": "Transferência bem-sucedida"
-    },
-    "title_slider": {
-      "string": "Gerencie\n<accent>seus saldos</accent>"
-    },
-    "title_numpad": {
-      "string": "<accent>Saldo</accent> de Gastos"
-    },
-    "title_receive": {
-      "string": "<accent>Limite</accent> de recebimento"
-    },
-    "text_slider": {
-      "string": "Escolha quanto prefer gastar instantaneamente e quanto deseja poupar."
-    },
-    "text_numpad": {
-      "string": "Digite a quantia de dinheiro que deseja poder gastar instantaneamente."
+    "confirm": {
+      "string": "Por favor\n<accent>confirme</accent>"
     },
     "swipe": {
       "string": "Deslizar Para Transferir"
-    },
-    "error_min_amount": {
-      "string": "O valor gasto precisa ser de pelo menos ₿ {amount}"
-    },
-    "error_max_amount": {
-      "string": "O valor gasto precisa ser menor do que ₿ {amount}"
+    }
+  },
+  "spending_intro": {
+    "button": {
+      "string": "Começar"
     }
   },
   "transfer_failed": {
@@ -93,6 +77,34 @@
       "string": "Tente novamente"
     }
   },
+  "savings_intro": {
+    "button": {
+      "string": "Começar"
+    }
+  },
+  "availability": {
+    "text": {
+      "string": "A transferência de fundos para a poupança geralmente é instantânea, mas pode levar até <accent>14 dias</accent> em determinadas condições da rede."
+    }
+  },
+  "savings_advanced": {
+    "total": {
+      "string": "Total selecionado"
+    }
+  },
+  "savings_interrupted": {
+    "text": {
+      "string": "Os fundos ainda não foram transferidos. A Bitkit tentará iniciar a transferência durante os próximos <accent>30 minutos</accent>. Por favor, mantenha o aplicativo aberto."
+    }
+  },
+  "transfer_success": {
+    "nav_title": {
+      "string": "Transferência bem-sucedida"
+    },
+    "text_spending": {
+      "string": "Seus fundos foram transferidos e seu saldo de gastos está pronto para ser usado."
+    }
+  },
   "error_channel_purchase": {
     "string": "Falha na Configuração de Pagamentos Instantâneos"
   },
@@ -102,9 +114,6 @@
   "error_channel_receiving": {
     "string": "O valor a ser recebido precisa ser maior que ${usdValue}"
   },
-  "enter_money": {
-    "string": "Digite a quantidade de bitcoin que deseja gastar instantaneamente."
-  },
   "spending": {
     "string": "Gastos"
   },
@@ -114,57 +123,9 @@
   "spending_label": {
     "string": "Saldo de gastos"
   },
-  "spending_label_additional": {
-    "string": "Saldo de gastos adicional"
-  },
   "receiving_label": {
     "string": "Capacidade de recebimento"
   },
-  "receiving_label_additional": {
-    "string": "Capacidade de recebimento adicional"
-  },
-  "note_blocktank_limit": {
-    "string": "O valor que você pode transferir para seu saldo de gastos está atualmente limitado a US${usdValue}."
-  },
-  "note_reserve_limit": {
-    "string": "O valor que pode transferir para seu saldo de gastos é limitado a {percentage}%."
-  },
-  "quick_setup": {
-    "string": "Configuração Rápida"
-  },
-  "quick_confirm_header": {
-    "string": "Por favor\n<accent>confirme</accent>"
-  },
-  "quick_confirm_cost": {
-    "string": "Custa <accent>{txFee}</accent> em taxas de rede e <accent>{lspFee}</accent> em taxas de provedor de serviços para transferir seus fundos."
-  },
-  "spending_amount_bitcoin": {
-    "string": "Escolha quanto quer poder gastar instantaneamente."
-  },
-  "receiving_amount_money": {
-    "string": "Escolha quanto dinheiro você deseja receber instantaneamente."
-  },
-  "receiving_amount_bitcoin": {
-    "string": "Digite a quantidade de Bitcoin que você deseja receber instantaneamente."
-  },
-  "enter_custom_amount": {
-    "string": "Digite o Valor"
-  },
-  "custom_confirm_header": {
-    "string": "Por favor\n<accent>confirme</accent>"
-  },
-  "custom_confirm_cost": {
-    "string": "Custa <accent>{txFee}</accent> em taxas da rede e <accent>{lspFee}</accent> em taxas de provedor de serviços para transferir seus fundos. Seu saldo de gastos deve permanecer ativo por pelo menos <accentWithKeyboard>{weeks, plural, one {# week} outros {# weeks}}.<penIcon/></accentWithKeyboard>"
-  },
-  "duration_header": {
-    "string": "<accent>Duração</accent> do Saldo"
-  },
-  "duration_text": {
-    "string": "Escolha o número mínimo de semanas que o senhor deseja que essa parte do seu saldo de gastos (conexão Lightning) permaneça ativa."
-  },
-  "duration_week": {
-    "string": "{count, plural, one {semana} many {semanas} other {semanas}}"
-  },
   "setting_up_header": {
     "string": "Em transferência"
   },
@@ -186,39 +147,6 @@
   "setting_up_button": {
     "string": "Continuar Usando o Bitkit"
   },
-  "result_header": {
-    "string": "<accent>Pronto</accent>"
-  },
-  "result_text": {
-    "string": "Seus fundos foram transferidos e seu saldo de gastos está pronto para ser usado."
-  },
-  "timeout_header": {
-    "string": "<accent>Mantenha o app</accent>\naberto"
-  },
-  "timeout_text": {
-    "string": "Os fundos ainda não foram transferidos. A Bitkit tentará iniciar a transferência durante os próximos <accent>30 minutos</accent>. Por favor, mantenha o aplicativo aberto."
-  },
-  "transfer_close": {
-    "string": "A transferência do saldo de gastos de volta para a poupança exige uma tarifa de rede. A tarifa exata depende das condições da rede."
-  },
-  "ts_savings_title": {
-    "string": "Transferir\n<accent>para Poupança</accent>"
-  },
-  "ts_savings_text": {
-    "string": "Seus fundos foram transferidos para sua poupança. Você pode usar esses fundos imediatamente."
-  },
-  "interrupted_title": {
-    "string": "Transferência Interrompida"
-  },
-  "availability_title": {
-    "string": "Disponibilidade de Fundos"
-  },
-  "availability_header": {
-    "string": "Disponibilidade do\n<accent>saldo</accent>"
-  },
-  "availability_text": {
-    "string": "A transferência de fundos para a poupança geralmente é instantânea, mas pode levar até <accent>14 dias</accent> em determinadas condições da rede."
-  },
   "node_info": {
     "string": "Nó Lightning"
   },
@@ -342,9 +270,6 @@
   "connection_closed": {
     "title": {
       "string": "Conexão Desativada"
-    },
-    "description": {
-      "string": "Sua Lightning Connection foi desativada. Seus fundos foram transferidos para sua poupança."
     }
   },
   "close_conn": {
diff --git a/src/utils/i18n/locales/ru/cards.json b/src/utils/i18n/locales/ru/cards.json
index e8cedfb32..ebbfe992a 100644
--- a/src/utils/i18n/locales/ru/cards.json
+++ b/src/utils/i18n/locales/ru/cards.json
@@ -69,9 +69,6 @@
     }
   },
   "transferClosingChannel": {
-    "title": {
-      "string": "Запуск..."
-    },
     "description": {
       "string": "Держите приложение открытым"
     }
diff --git a/src/utils/i18n/locales/ru/common.json b/src/utils/i18n/locales/ru/common.json
index 03aa0b32e..365f39802 100644
--- a/src/utils/i18n/locales/ru/common.json
+++ b/src/utils/i18n/locales/ru/common.json
@@ -85,5 +85,8 @@
   },
   "connect": {
     "string": "Подключиться"
+  },
+  "default": {
+    "string": "По умолчанию"
   }
 }
diff --git a/src/utils/i18n/locales/ru/lightning.json b/src/utils/i18n/locales/ru/lightning.json
index 3f9d56be5..1f8b29c6d 100644
--- a/src/utils/i18n/locales/ru/lightning.json
+++ b/src/utils/i18n/locales/ru/lightning.json
@@ -1,5 +1,5 @@
 {
-  "introduction": {
+  "transfer_intro": {
     "title": {
       "string": "Расходы\n<accent>Баланс</accent>"
     },
@@ -48,32 +48,16 @@
     "nav_title": {
       "string": "Перенос Средств"
     },
-    "nav_successful": {
-      "string": "Перенос выполнен успешно"
-    },
-    "title_slider": {
-      "string": "Баланс\n<accent>ваших средств</accent>"
-    },
-    "title_numpad": {
-      "string": "Баланс <accent>для расходов</accent>"
-    },
-    "title_receive": {
-      "string": "Входящая <accent>емкость</accent>"
-    },
-    "text_slider": {
-      "string": "Выберите, сколько денег вы хотите потратить мгновенно, и сколько вы хотите оставить в сбережениях."
-    },
-    "text_numpad": {
-      "string": "Введите сумму денег, которую вы хотите иметь возможность потратить мгновенно."
+    "confirm": {
+      "string": "Пожалуйста\n<accent>подтвердите</accent>"
     },
     "swipe": {
       "string": "Перенести"
-    },
-    "error_min_amount": {
-      "string": "Сумма для расходов должна быть не менее ₿ {amount}"
-    },
-    "error_max_amount": {
-      "string": "Сумма для расходов должна быть меньше, чем ₿ {amount}"
+    }
+  },
+  "spending_intro": {
+    "button": {
+      "string": "Начать"
     }
   },
   "transfer_failed": {
@@ -93,6 +77,34 @@
       "string": "Попробовать снова"
     }
   },
+  "savings_intro": {
+    "button": {
+      "string": "Начать"
+    }
+  },
+  "availability": {
+    "text": {
+      "string": "Перенос средств в сбережения обычно мгновенный, но расчет может занять до <accent>14 дней</accent> в определенных сетевых условиях."
+    }
+  },
+  "savings_advanced": {
+    "total": {
+      "string": "Всего выбрано"
+    }
+  },
+  "savings_interrupted": {
+    "text": {
+      "string": "Средства еще не переведены. Bitkit попытается инициировать перевод в течение следующих <accent>30 минут</accent>. Пожалуйста, держите приложение открытым."
+    }
+  },
+  "transfer_success": {
+    "nav_title": {
+      "string": "Перенос выполнен успешно"
+    },
+    "text_spending": {
+      "string": "Ваши средства переведены, и ваш баланс для расходов готов к использованию."
+    }
+  },
   "error_channel_purchase": {
     "string": "Ошибка Настройки Мгновенных Платежей"
   },
@@ -102,9 +114,6 @@
   "error_channel_receiving": {
     "string": "Входящий Баланс должен быть больше ${usdValue}"
   },
-  "enter_money": {
-    "string": "Введите сумму биткоина, которую вы хотите тратить мгновенно."
-  },
   "spending": {
     "string": "Расходы"
   },
@@ -114,51 +123,9 @@
   "spending_label": {
     "string": "Баланс Расходов"
   },
-  "spending_label_additional": {
-    "string": "Дополнительный баланс для расходов"
-  },
   "receiving_label": {
     "string": "Входящий Баланс"
   },
-  "receiving_label_additional": {
-    "string": "Дополнительный Входящий Баланс"
-  },
-  "note_blocktank_limit": {
-    "string": "Сумма, которую вы можете перевести на ваш баланс для трат, в настоящее время ограничена ${usdValue}."
-  },
-  "note_reserve_limit": {
-    "string": "Сумма, которую вы можете перевести на ваш баланс для трат, ограничена {percentage}%. Вам нужно сохранить средства в резерве, чтобы переместить этот биткоин обратно в сбережения."
-  },
-  "quick_setup": {
-    "string": "Быстрая Настройка"
-  },
-  "quick_confirm_header": {
-    "string": "Пожалуйста\n<accent>подтвердите</accent>"
-  },
-  "quick_confirm_cost": {
-    "string": "Это стоит <accent>{txFee}</accent> в сетевых комиссиях и <accent>{lspFee}</accent> в комиссиях поставщика услуг для перевода ваших средств."
-  },
-  "spending_amount_bitcoin": {
-    "string": "Выберите, сколько денег вы хотите потратить мгновенно."
-  },
-  "receiving_amount_money": {
-    "string": "Выберите, сколько денег вы хотите получать мгновенно."
-  },
-  "receiving_amount_bitcoin": {
-    "string": "Введите сумму Биткоинов, которую вы хотите получать мгновенно."
-  },
-  "enter_custom_amount": {
-    "string": "Введите сумму"
-  },
-  "custom_confirm_header": {
-    "string": "Пожалуйста\n<accent>подтвердите</accent>"
-  },
-  "duration_header": {
-    "string": "Длительность <accent>баланса</accent>"
-  },
-  "duration_text": {
-    "string": "Выберите минимальное количество недель, на которое эта часть вашего баланса для расходов (Lightning Channel) останется активной."
-  },
   "setting_up_header": {
     "string": "В процессе перевода"
   },
@@ -180,39 +147,6 @@
   "setting_up_button": {
     "string": "Продолжить использование Bitkit"
   },
-  "result_header": {
-    "string": "<accent>Готово</accent>"
-  },
-  "result_text": {
-    "string": "Ваши средства переведены, и ваш баланс для расходов готов к использованию."
-  },
-  "timeout_header": {
-    "string": "<accent>Держите Bitkit</accent>\nоткрытым"
-  },
-  "timeout_text": {
-    "string": "Средства еще не переведены. Bitkit попытается инициировать перевод в течение следующих <accent>30 минут</accent>. Пожалуйста, держите приложение открытым."
-  },
-  "transfer_close": {
-    "string": "Для перевода вашего баланса для расходов обратно в сбережения требуется сетевая комиссия. Точная комиссия зависит от условий сети."
-  },
-  "ts_savings_title": {
-    "string": "Перевод\n<accent>в Сбережения</accent>"
-  },
-  "ts_savings_text": {
-    "string": "Ваши средства переведены в сбережения. Вы можете использовать эти средства немедленно."
-  },
-  "interrupted_title": {
-    "string": "Перенос Прерван"
-  },
-  "availability_title": {
-    "string": "Доступность Средств"
-  },
-  "availability_header": {
-    "string": "Доступность\n<accent>Средств</accent>"
-  },
-  "availability_text": {
-    "string": "Перенос средств в сбережения обычно мгновенный, но расчет может занять до <accent>14 дней</accent> в определенных сетевых условиях."
-  },
   "node_info": {
     "string": "Лайтнинг Нода"
   },
@@ -330,9 +264,6 @@
   "connection_closed": {
     "title": {
       "string": "Соединение Закрыто"
-    },
-    "description": {
-      "string": "Ваше соединение Lightning закрыто. Ваши средства переведены на ваш сберегательный баланс."
     }
   },
   "close_conn": {