Merge branch 'master' into modal

.circleci/config.yml

@@ -3,7 +3,7 @@ jobs:
 
   lint:
     docker:
-      - image: cimg/node:16.20.2
+      - image: cimg/node:20.16.0
 
     working_directory: ~/repo
 
@@ -26,7 +26,7 @@ jobs:
 
   unit:
     docker:
-      - image: cimg/node:16.20.2
+      - image: cimg/node:20.16.0
 
     working_directory: ~/repo
 
@@ -50,7 +50,7 @@ jobs:
 
   integration:
     docker:
-      - image: cimg/node:16.20.2
+      - image: cimg/node:20.16.0
 
     environment:
       RETRY: "1"
@@ -74,7 +74,7 @@ jobs:
 
       # run tests!
       - run:
-          command: npm run jest || npm run jest || npm run jest
+          command: npm run jest || npm run jest || npm run jest || npm run jest
 
 # Orchestrate our job run sequence
 workflows:

.github/workflows/ci.yml

@@ -42,7 +42,7 @@ jobs:
       run: npm install
 
     - name: Run tests
-      run: npm test || npm test || npm test
+      run: npm test || npm test || npm test || npm test
       env:
         BIP47_HD_MNEMONIC: ${{ secrets.BIP47_HD_MNEMONIC}}
         HD_MNEMONIC: ${{ secrets.HD_MNEMONIC }}

package.json

@@ -163,7 +163,7 @@
     "react-native-default-preference": "1.4.4",
     "react-native-device-info": "11.1.0",
     "react-native-document-picker": "https://github.com/BlueWallet/react-native-document-picker#6033c4e1b0dd0a6760b5f5a5a2c3b2e5d07f2ae4",
-    "react-native-draggable-flatlist": "github:BlueWallet/react-native-draggable-flatlist#ebfddc4",
+    "react-native-draggable-flatlist": "github:BlueWallet/react-native-draggable-flatlist#3061e30",
     "react-native-fs": "2.20.0",
     "react-native-gesture-handler": "2.17.1",
     "react-native-handoff": "https://github.com/BlueWallet/react-native-handoff#31d005f93d31099d0e564590a3bbd052b8a02b39",