From c9b286fc10dcad4045b91bf76d3c48fcbe2248a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Rodriguez=20V=C3=A9lez?= <marcospr@pm.me>
Date: Fri, 22 Oct 2021 01:38:28 -0400
Subject: [PATCH 1/2] FIX: Use existing UID instead of recreating one

---
 ios/BlueWallet/AppDelegate.m   | 14 --------------
 ios/Settings.bundle/Root.plist |  2 +-
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/ios/BlueWallet/AppDelegate.m b/ios/BlueWallet/AppDelegate.m
index 1c8b0b144..c12de3815 100644
--- a/ios/BlueWallet/AppDelegate.m
+++ b/ios/BlueWallet/AppDelegate.m
@@ -42,7 +42,6 @@ static void InitializeFlipper(UIApplication *application) {
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
   [Bugsnag start];
-  [self registerDefaultsFromSettingsBundle];
 #if !TARGET_OS_MACCATALYST
 #ifdef FB_SONARKIT_ENABLED
   InitializeFlipper(application);
@@ -79,19 +78,6 @@ static void InitializeFlipper(UIApplication *application) {
   return YES;
 }
 
-#pragma NSUserDefaults
-- (void)registerDefaultsFromSettingsBundle {
-    // this function writes default settings as settings
-    NSString *settingsBundle = [[NSBundle mainBundle] pathForResource:@"Settings" ofType:@"bundle"];
-    if(!settingsBundle) {
-        NSLog(@"Could not find Settings.bundle");
-        return;
-    }
-
-    [[NSUserDefaults standardUserDefaults] setValue:UIDevice.currentDevice.identifierForVendor.UUIDString forKey:@"uniqueid"];
-    [[NSUserDefaults standardUserDefaults] synchronize];
-}
-
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
 {
 #if DEBUG
diff --git a/ios/Settings.bundle/Root.plist b/ios/Settings.bundle/Root.plist
index 1cd60e7df..48753930f 100644
--- a/ios/Settings.bundle/Root.plist
+++ b/ios/Settings.bundle/Root.plist
@@ -20,7 +20,7 @@
 			<key>Title</key>
 			<string>Unique ID</string>
 			<key>Key</key>
-			<string>uniqueid</string>
+			<string>deviceUID</string>
 		</dict>
 	</array>
 </dict>

From 721e1514b4a124614b42cd53a2cffcaff0d6a7ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Rodriguez=20V=C3=A9lez?= <marcospr@pm.me>
Date: Fri, 22 Oct 2021 01:54:06 -0400
Subject: [PATCH 2/2] FIX: RTL fixes

---
 screen/wallets/export.js       | 9 ++++++---
 screen/wallets/pleaseBackup.js | 1 +
 screen/wallets/transactions.js | 1 -
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/screen/wallets/export.js b/screen/wallets/export.js
index 1a47bbbbf..19514e649 100644
--- a/screen/wallets/export.js
+++ b/screen/wallets/export.js
@@ -28,11 +28,14 @@ const styles = StyleSheet.create({
   },
   secret: {
     alignSelf: 'stretch',
-    alignItems: 'center',
+    textAlign: 'center',
     paddingHorizontal: 16,
     fontSize: 16,
     lineHeight: 24,
   },
+  secretWritingDirection: {
+    writingDirection: 'ltr',
+  },
 });
 
 const WalletExport = () => {
@@ -53,7 +56,7 @@ const WalletExport = () => {
       backgroundColor: colors.elevated,
     },
     type: { ...styles.type, color: colors.foregroundColor },
-    secret: { ...styles.secret, color: colors.foregroundColor },
+    secret: { color: colors.foregroundColor },
     warning: { ...styles.secret, color: colors.failedColor },
   };
 
@@ -124,7 +127,7 @@ const WalletExport = () => {
             {wallet.type === LightningCustodianWallet.type || wallet.type === WatchOnlyWallet.type ? (
               <BlueCopyTextToClipboard text={wallet.getSecret()} />
             ) : (
-              <BlueText style={stylesHook.secret} testID="Secret">
+              <BlueText style={[styles.secret, styles.secretWritingDirection, stylesHook.secret]} testID="Secret">
                 {wallet.getSecret()}
               </BlueText>
             )}
diff --git a/screen/wallets/pleaseBackup.js b/screen/wallets/pleaseBackup.js
index bdbc3401f..c08870c17 100644
--- a/screen/wallets/pleaseBackup.js
+++ b/screen/wallets/pleaseBackup.js
@@ -139,6 +139,7 @@ const styles = StyleSheet.create({
     marginVertical: 16,
     fontSize: 16,
     fontWeight: '500',
+    writingDirection: I18nManager.isRTL ? 'rtl' : 'ltr',
   },
   secret: {
     flexWrap: 'wrap',
diff --git a/screen/wallets/transactions.js b/screen/wallets/transactions.js
index 51944d2ea..170dad4b1 100644
--- a/screen/wallets/transactions.js
+++ b/screen/wallets/transactions.js
@@ -741,7 +741,6 @@ const styles = StyleSheet.create({
     minHeight: 130,
   },
   walletDetails: {
-    minWidth: 150,
     justifyContent: 'center',
     alignItems: 'flex-end',
   },