REF: resolved conflict

.circleci/config.yml

@@ -3,7 +3,7 @@ jobs:
 
   lint:
     docker:
-      - image: cimg/node:16.17.1
+      - image: cimg/node:16.20.0
 
     working_directory: ~/repo
 
@@ -26,7 +26,7 @@ jobs:
 
   unit:
     docker:
-      - image: cimg/node:16.17.1
+      - image: cimg/node:16.20.0
 
     working_directory: ~/repo
 
@@ -50,10 +50,12 @@ jobs:
 
   integration:
     docker:
-      - image: cimg/node:16.17.1
+      - image: cimg/node:16.20.0
 
     working_directory: ~/repo
 
+    resource_class: large
+
     steps:
       - checkout
 

.detoxrc.json

@@ -1,7 +1,11 @@
 {
-  "testRunner": "jest",
-  "runnerConfig": "tests/e2e/config.json",
-  "skipLegacyWorkersInjection": true,
+  "testRunner": {
+    "$0": "jest",
+    "args": {
+      "config": "tests/e2e/jest.config.js",
+      "_": ["e2e"]
+    }
+  },
   "apps": {
     "ios": {
       "type": "ios.app",

.eslintrc

@@ -68,5 +68,10 @@
   "env": {
     "es6": true
   },
-  "globals": { "fetch": false }
+  "globals": { "fetch": false },
+  "settings": {
+    "react": { // this is for eslint-plugin-react
+      "version": "detect" // React version. "detect" automatically picks the version you have installed.
+    }
+  }
 }

.github/workflows/build-release-apk.yml

@@ -30,7 +30,7 @@ jobs:
           cache: 'gradle'
 
       - name: Install node_modules
-        run: npm install
+        run: npm install --production
 
       - name: Build
         env:

.github/workflows/ci.yml

@@ -39,6 +39,7 @@ jobs:
     - name: Run tests
       run: npm test || npm test || npm test
       env:
+        BIP47_HD_MNEMONIC: ${{ secrets.BIP47_HD_MNEMONIC}}
         HD_MNEMONIC: ${{ secrets.HD_MNEMONIC }}
         HD_MNEMONIC_BIP49: ${{ secrets.HD_MNEMONIC_BIP49 }}
         HD_MNEMONIC_BIP49_MANY_TX: ${{ secrets.HD_MNEMONIC_BIP49_MANY_TX }}
@@ -94,7 +95,7 @@ jobs:
         avd-name: Pixel_API_29_AOSP
         emulator-options: -no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim -camera-back none -camera-front none -partition-size 2047
         arch: x86_64
-        script: npm run e2e:release-test || npm run e2e:release-test || npm run e2e:release-test
+        script: npm run e2e:release-test || npm run e2e:release-test || npm run e2e:release-test  || npm run e2e:release-test
       env:
         TRAVIS: 1
         HD_MNEMONIC: ${{ secrets.HD_MNEMONIC }}

.gitignore

@@ -20,7 +20,11 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
+ios/.xcode.env.local
 *.hprof
+.cxx/
+*.keystore
+!debug.keystore
 
 # Android/IntelliJ
 #
@@ -52,6 +56,7 @@ buck-out/
 */fastlane/report.xml
 */fastlane/Preview.html
 */fastlane/screenshots
+**/fastlane/test_output
 
 # Bundle artifact
 *.jsbundle
@@ -61,8 +66,12 @@ release-notes.json
 release-notes.txt
 current-branch.json
 
-ios/Pods/
-
+# Ruby / CocoaPods
+/ios/Pods/
+/vendor/bundle/
+
+# Temporary files created by Metro to check the health of the file watcher
+.metro-health-check*
 artifacts/
 
 # Editors

.ruby-version

@@ -1 +1 @@
-2.7.4
+2.7.6

.tx/config

@@ -1,42 +1,43 @@
 [main]
 host = https://www.transifex.com
 
-[bluewallet.loc-en-json--master]
-file_filter = loc/<lang>.json
-minimum_perc = 30
-source_file = loc/en.json
-source_lang = en
-type = KEYVALUEJSON
-lang_map = af_ZA: zar_afr, bg_BG: bg_bg, ca: ca, cs_CZ: cs_cz, cy: cy, da_DK: da_dk, de_DE: de_de, el: el, es_ES: es, fa_IR: fa, fi_FI: fi_fi, fr_FR: fr_fr, hr_HR: hr_hr, hu_HU: hu_hu, id_ID: id_id, ja_JP: jp_jp, nb_NO: nb_no, nl_NL: nl_nl, pt_BR: pt_br, pt_PT: pt_pt, ro: ro, sk_SK: sk_sk, sv_SE: sv_se, th_TH: th_th, tr_TR: tr_tr, uk_UA: ua, vi_VN: vi_vn, xh: zar_xho, zh_CN: zh_cn, zh_TW: zh_tw
-
-[bluewallet-fastlane.ios-fastlane-metadata-en-us-description-txt--master]
-file_filter = ios/fastlane/metadata/<lang>/description.txt
+[o:bluewallet:p:bluewallet-fastlane:r:ios-fastlane-metadata-en-us-description-txt--master]
+file_filter  = ios/fastlane/metadata/<lang>/description.txt
+source_file  = ios/fastlane/metadata/en-US/description.txt
+source_lang  = en_US
+type         = TXT
 minimum_perc = 10
-source_file = ios/fastlane/metadata/en-US/description.txt
-source_lang = en_US
-type = TXT
-lang_map = ar_SA: ar-SA, de_DE: de-DE, es_ES: es-ES, es_MX: es-MX, fr_CA: fr-CA, fr_FR: fr-FR, nl_NL: nl-NL, pt_BR: pt-BR, pt_PT: pt-PT, zh_CN: zh-Hans, zh_HK: zh-Hant
+lang_map     = fr_FR: fr-FR, nl_NL: nl-NL, pt_BR: pt-BR, zh_CN: zh-Hans, zh_HK: zh-Hant, ar_SA: ar-SA, es_MX: es-MX, fr_CA: fr-CA, pt_PT: pt-PT, de_DE: de-DE, es_ES: es-ES
 
-[bluewallet-fastlane.ios-fastlane-metadata-en-us-keywords-txt--master]
-file_filter = ios/fastlane/metadata/<lang>/keywords.txt
+[o:bluewallet:p:bluewallet-fastlane:r:ios-fastlane-metadata-en-us-keywords-txt--master]
+file_filter  = ios/fastlane/metadata/<lang>/keywords.txt
+source_file  = ios/fastlane/metadata/en-US/keywords.txt
+source_lang  = en_US
+type         = TXT
 minimum_perc = 10
-source_file = ios/fastlane/metadata/en-US/keywords.txt
-source_lang = en_US
-type = TXT
-lang_map = ar_SA: ar-SA, de_DE: de-DE, es_ES: es-ES, es_MX: es-MX, fr_CA: fr-CA, fr_FR: fr-FR, nl_NL: nl-NL, pt_BR: pt-BR, pt_PT: pt-PT, zh_CN: zh-Hans, zh_HK: zh-Hant
+lang_map     = es_ES: es-ES, es_MX: es-MX, fr_CA: fr-CA, fr_FR: fr-FR, nl_NL: nl-NL, pt_BR: pt-BR, zh_CN: zh-Hans, ar_SA: ar-SA, de_DE: de-DE, pt_PT: pt-PT, zh_HK: zh-Hant
 
-[bluewallet-fastlane.ios-fastlane-metadata-en-us-name-txt--master]
-file_filter = ios/fastlane/metadata/<lang>/name.txt
+[o:bluewallet:p:bluewallet-fastlane:r:ios-fastlane-metadata-en-us-name-txt--master]
+file_filter  = ios/fastlane/metadata/<lang>/name.txt
+source_file  = ios/fastlane/metadata/en-US/name.txt
+source_lang  = en_US
+type         = TXT
 minimum_perc = 10
-source_file = ios/fastlane/metadata/en-US/name.txt
-source_lang = en_US
-type = TXT
-lang_map = ar_SA: ar-SA, de_DE: de-DE, es_ES: es-ES, es_MX: es-MX, fr_CA: fr-CA, fr_FR: fr-FR, nl_NL: nl-NL, pt_BR: pt-BR, pt_PT: pt-PT, zh_CN: zh-Hans, zh_HK: zh-Hant
+lang_map     = zh_HK: zh-Hant, ar_SA: ar-SA, es_MX: es-MX, fr_FR: fr-FR, nl_NL: nl-NL, pt_BR: pt-BR, pt_PT: pt-PT, zh_CN: zh-Hans, de_DE: de-DE, es_ES: es-ES, fr_CA: fr-CA
 
-[bluewallet-fastlane.ios-fastlane-metadata-en-us-promotional-text-txt--master]
-file_filter = ios/fastlane/metadata/<lang>/promotional_text.txt
+[o:bluewallet:p:bluewallet-fastlane:r:ios-fastlane-metadata-en-us-promotional-text-txt--master]
+file_filter  = ios/fastlane/metadata/<lang>/promotional_text.txt
+source_file  = ios/fastlane/metadata/en-US/promotional_text.txt
+source_lang  = en_US
+type         = TXT
 minimum_perc = 10
-source_file = ios/fastlane/metadata/en-US/promotional_text.txt
-source_lang = en_US
-type = TXT
-lang_map = ar_SA: ar-SA, de_DE: de-DE, es_ES: es-ES, es_MX: es-MX, fr_CA: fr-CA, fr_FR: fr-FR, nl_NL: nl-NL, pt_BR: pt-BR, pt_PT: pt-PT, zh_CN: zh-Hans, zh_HK: zh-Hant
+lang_map     = zh_CN: zh-Hans, zh_HK: zh-Hant, ar_SA: ar-SA, es_MX: es-MX, fr_CA: fr-CA, fr_FR: fr-FR, pt_PT: pt-PT, de_DE: de-DE, es_ES: es-ES, nl_NL: nl-NL, pt_BR: pt-BR
+
+[o:bluewallet:p:bluewallet:r:loc-en-json--master]
+file_filter  = loc/<lang>.json
+source_file  = loc/en.json
+source_lang  = en
+type         = KEYVALUEJSON
+minimum_perc = 30
+lang_map     = vi_VN: vi_vn, zh_TW: zh_tw, af_ZA: zar_afr, id_ID: id_id, sk_SK: sk_sk, ja_JP: jp_jp, uk_UA: ua, zh_CN: zh_cn, hr_HR: hr_hr, tr_TR: tr_tr, sv_SE: sv_se, th_TH: th_th, pt_BR: pt_br, es_ES: es, fr_FR: fr_fr, hu_HU: hu_hu, nl_NL: nl_nl, ro: ro, ca: ca, cy: cy, de_DE: de_de, nb_NO: nb_no, pt_PT: pt_pt, xh: zar_xho, bg_BG: bg_bg, cs_CZ: cs_cz, da_DK: da_dk, el: el, fa_IR: fa, fi_FI: fi_fi
+

.xcode-env

@@ -0,0 +1,13 @@
+# This `.xcode.env` file is versioned and is used to source the 
+environment
+# used when running script phases inside Xcode.
+# To customize your local environment, you can create an 
+`.xcode.env.local`
+# file that is not versioned.
+
+# NODE_BINARY variable contains the PATH to the node executable.
+#
+# Customize the NODE_BINARY variable here.
+# For example, to use nvm with brew, add the following line
+# . "$(brew --prefix nvm)/nvm.sh" --no-use
+export NODE_BINARY=$(command -v node)

App.js

@@ -291,7 +291,7 @@ const App = () => {
       currency.updateExchangeRate();
       const processed = await processPushNotifications();
       if (processed) return;
-      const clipboard = await BlueClipboard.getClipboardContent();
+      const clipboard = await BlueClipboard().getClipboardContent();
       const isAddressFromStoredWallet = wallets.some(wallet => {
         if (wallet.chain === Chain.ONCHAIN) {
           // checking address validity is faster than unwrapping hierarchy only to compare it to garbage
@@ -332,38 +332,40 @@ const App = () => {
 
   const showClipboardAlert = ({ contentType }) => {
     ReactNativeHapticFeedback.trigger('impactLight', { ignoreAndroidSystemSettings: false });
-    BlueClipboard.getClipboardContent().then(clipboard => {
-      if (Platform.OS === 'ios' || Platform.OS === 'macos') {
-        ActionSheet.showActionSheetWithOptions(
-          {
-            options: [loc._.cancel, loc._.continue],
-            title: loc._.clipboard,
-            message: contentType === ClipboardContentType.BITCOIN ? loc.wallets.clipboard_bitcoin : loc.wallets.clipboard_lightning,
-            cancelButtonIndex: 0,
-          },
-          buttonIndex => {
-            if (buttonIndex === 1) {
-              handleOpenURL({ url: clipboard });
-            }
-          },
-        );
-      } else {
-        ActionSheet.showActionSheetWithOptions({
-          buttons: [
-            { text: loc._.cancel, style: 'cancel', onPress: () => {} },
+    BlueClipboard()
+      .getClipboardContent()
+      .then(clipboard => {
+        if (Platform.OS === 'ios' || Platform.OS === 'macos') {
+          ActionSheet.showActionSheetWithOptions(
             {
-              text: loc._.continue,
-              style: 'default',
-              onPress: () => {
+              options: [loc._.cancel, loc._.continue],
+              title: loc._.clipboard,
+              message: contentType === ClipboardContentType.BITCOIN ? loc.wallets.clipboard_bitcoin : loc.wallets.clipboard_lightning,
+              cancelButtonIndex: 0,
+            },
+            buttonIndex => {
+              if (buttonIndex === 1) {
                 handleOpenURL({ url: clipboard });
-              },
+              }
             },
-          ],
-          title: loc._.clipboard,
-          message: contentType === ClipboardContentType.BITCOIN ? loc.wallets.clipboard_bitcoin : loc.wallets.clipboard_lightning,
-        });
-      }
-    });
+          );
+        } else {
+          ActionSheet.showActionSheetWithOptions({
+            buttons: [
+              { text: loc._.cancel, style: 'cancel', onPress: () => {} },
+              {
+                text: loc._.continue,
+                style: 'default',
+                onPress: () => {
+                  handleOpenURL({ url: clipboard });
+                },
+              },
+            ],
+            title: loc._.clipboard,
+            message: contentType === ClipboardContentType.BITCOIN ? loc.wallets.clipboard_bitcoin : loc.wallets.clipboard_lightning,
+          });
+        }
+      });
   };
 
   return (

BlueComponents.js

@@ -53,7 +53,7 @@ export const BlueButton = props => {
       style={{
         borderWidth: 0.7,
         borderColor: 'transparent',
-        backgroundColor: backgroundColor,
+        backgroundColor,
         minHeight: 45,
         height: 45,
         maxHeight: 45,
@@ -89,7 +89,7 @@ export const SecondButton = forwardRef((props, ref) => {
       style={{
         borderWidth: 0.7,
         borderColor: 'transparent',
-        backgroundColor: backgroundColor,
+        backgroundColor,
         minHeight: 45,
         height: 45,
         maxHeight: 45,
@@ -559,7 +559,12 @@ export const BlueHeaderDefaultMain = props => {
       >
         {props.leftText}
       </Text>
-      <PlusIcon onPress={props.onNewWalletPress} Component={TouchableOpacity} />
+      <PlusIcon
+        accessibilityRole="button"
+        accessibilityLabel={loc.wallets.add_title}
+        onPress={props.onNewWalletPress}
+        Component={TouchableOpacity}
+      />
     </View>
   );
 };

Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
-ruby '2.7.4'
+ruby '>= 2.6.10'
 
-gem 'cocoapods', '~> 1.11', '>= 1.11.2'
+gem 'cocoapods', '~> 1.11', '>= 1.11.3'

Navigation.js

@@ -83,6 +83,9 @@ import { isDesktop, isTablet, isHandset } from './blue_modules/environment';
 import SettingsPrivacy from './screen/settings/SettingsPrivacy';
 import LNDViewAdditionalInvoicePreImage from './screen/lnd/lndViewAdditionalInvoicePreImage';
 import LdkViewLogs from './screen/wallets/ldkViewLogs';
+import PaymentCode from './screen/wallets/paymentCode';
+import PaymentCodesList from './screen/wallets/paymentCodesList';
+import loc from './loc';
 
 const WalletsStack = createNativeStackNavigator();
 
@@ -465,6 +468,20 @@ const ExportMultisigCoordinationSetupRoot = () => {
   );
 };
 
+const PaymentCodeStack = createNativeStackNavigator();
+const PaymentCodeStackRoot = () => {
+  return (
+    <PaymentCodeStack.Navigator name="PaymentCodeRoot" screenOptions={{ headerHideShadow: true }} initialRouteName="PaymentCode">
+      <PaymentCodeStack.Screen name="PaymentCode" component={PaymentCode} options={{ headerTitle: loc.bip47.payment_code }} />
+      <PaymentCodeStack.Screen
+        name="PaymentCodesList"
+        component={PaymentCodesList}
+        options={{ headerTitle: loc.bip47.payment_codes_list }}
+      />
+    </PaymentCodeStack.Navigator>
+  );
+};
+
 const RootStack = createNativeStackNavigator();
 const NavigationDefaultOptions = { headerShown: false, stackPresentation: isDesktop ? 'containedModal' : 'modal' };
 const Navigation = () => {
@@ -500,6 +517,8 @@ const Navigation = () => {
           stackPresentation: isDesktop ? 'containedModal' : 'fullScreenModal',
         }}
       />
+
+      <RootStack.Screen name="PaymentCodeRoot" component={PaymentCodeStackRoot} options={NavigationDefaultOptions} />
     </RootStack.Navigator>
   );
 };