Merge branch 'dev' into dev_ci_docker_problem

Signed-off-by: Juan Carlos Carmona Calvo <[email protected]>
juanky201271 · Sep 12, 2024 · ec7794e · ec7794e
2 parents e972c38 + 6ced4d1
commit ec7794e
Show file tree

Hide file tree

Showing 23 changed files with 2,407 additions and 2,227 deletions.
diff --git a/.github/workflows/android-build.yaml b/.github/workflows/android-build.yaml
@@ -79,10 +79,10 @@ jobs:
         if: ${{ contains(github.repository, 'zingolib') }}
         run: |
           echo "zingolib_ref=$(echo ${GITHUB_REF} | sed 's/\//\\\//g')" >> $GITHUB_ENV
-          sed -i "/^zingolib\|^zingoconfig/ s/branch = \"dev\"/rev = \"${{ env.zingolib_ref }}\"/" "rust/lib/Cargo.toml"
-          if cat rust/lib/Cargo.toml | grep "^zingolib\|^zingoconfig" | grep -q "branch"; then exit 1; fi
+          sed -i "/^zingolib/ s/branch = \"dev\"/rev = \"${{ env.zingolib_ref }}\"/" "rust/lib/Cargo.toml"
+          if cat rust/lib/Cargo.toml | grep "^zingolib" | grep -q "branch"; then exit 1; fi
           cd rust
-          cargo update -p zingolib -p zingoconfig --aggressive
+          cargo update -p zingolib --aggressive
       
       - name: Cargo cache
         uses: Swatinem/rust-cache@v2

diff --git a/.github/workflows/create-cache-key.yaml b/.github/workflows/create-cache-key.yaml
@@ -34,9 +34,9 @@ jobs:
         if: ${{ contains(github.repository, 'zingolib') }}
         run: |
           echo "zingolib_ref=$(echo ${GITHUB_REF} | sed 's/\//\\\//g')" >> $GITHUB_ENV
-          sed -i "/^zingolib\|^zingoconfig/ s/branch = \"dev\"/rev = \"${{ env.zingolib_ref }}\"/" "rust/lib/Cargo.toml"
-          if cat rust/lib/Cargo.toml | grep "^zingolib\|^zingoconfig" | grep -q "branch"; then exit 1; fi
-          cd rust && cargo update -p zingolib -p zingoconfig --aggressive
+          sed -i "/^zingolib/ s/branch = \"dev\"/rev = \"${{ env.zingolib_ref }}\"/" "rust/lib/Cargo.toml"
+          if cat rust/lib/Cargo.toml | grep "^zingolib" | grep -q "branch"; then exit 1; fi
+          cd rust && cargo update -p zingolib --aggressive
       
       - name: Store Cargo version
         run: echo $(cargo --version) >> rust/cargo_version.txt

diff --git a/.github/workflows/ios-build.yaml b/.github/workflows/ios-build.yaml
@@ -60,10 +60,10 @@ jobs:
         if: ${{ contains(github.repository, 'zingolib') }}
         run: |
           echo "zingolib_ref=$(echo ${GITHUB_REF} | sed 's/\//\\\//g')" >> $GITHUB_ENV
-          sudo sed -i "/^zingolib\|^zingoconfig/ s/branch = \"dev\"/rev = \"${{ env.zingolib_ref }}\"/" "rust/lib/Cargo.toml"
-          if cat rust/lib/Cargo.toml | grep "^zingolib\|^zingoconfig" | grep -q "branch"; then exit 1; fi
+          sudo sed -i "/^zingolib/ s/branch = \"dev\"/rev = \"${{ env.zingolib_ref }}\"/" "rust/lib/Cargo.toml"
+          if cat rust/lib/Cargo.toml | grep "^zingolib" | grep -q "branch"; then exit 1; fi
           cd rust
-          sudo cargo update -p zingolib -p zingoconfig --aggressive
+          sudo cargo update -p zingolib --aggressive
           sudo rustup default nightly
 
       - name: Install Cargo Lipo

diff --git a/__mocks__/dataMocks/mockValueTransfers.ts b/__mocks__/dataMocks/mockValueTransfers.ts
@@ -1,10 +1,12 @@
 import { PoolEnum, ValueTransferType, ValueTransferKindEnum } from '../../app/AppState';
+import { RPCValueTransfersStatusEnum } from '../../app/rpc/enums/RPCValueTransfersStatusEnum';
 
 export const mockValueTransfers: ValueTransferType[] = [
   {
     kind: ValueTransferKindEnum.Sent,
     fee: 0.0001,
     confirmations: 22,
+    status: RPCValueTransfersStatusEnum.confirmed,
     txid: 'sent-txid-1234567890',
     time: Date.now() - 1000,
     zecPrice: 33.33,
@@ -16,6 +18,7 @@ export const mockValueTransfers: ValueTransferType[] = [
     kind: ValueTransferKindEnum.MemoToSelf,
     fee: 0.0001,
     confirmations: 12,
+    status: RPCValueTransfersStatusEnum.confirmed,
     txid: 'memotooself-txid-1234567890',
     time: Date.now() - 100,
     zecPrice: 33.33,
@@ -27,6 +30,7 @@ export const mockValueTransfers: ValueTransferType[] = [
     kind: ValueTransferKindEnum.SendToSelf,
     fee: 0.0001,
     confirmations: 12,
+    status: RPCValueTransfersStatusEnum.confirmed,
     txid: 'sendtooself-txid-1234567890',
     time: Date.now() - 100,
     zecPrice: 33.33,
@@ -36,6 +40,7 @@ export const mockValueTransfers: ValueTransferType[] = [
   {
     kind: ValueTransferKindEnum.Received,
     confirmations: 133,
+    status: RPCValueTransfersStatusEnum.confirmed,
     txid: 'receive-txid-1234567890',
     time: Date.now() - 10,
     zecPrice: 66.66,
@@ -48,6 +53,7 @@ export const mockValueTransfers: ValueTransferType[] = [
     kind: ValueTransferKindEnum.Shield,
     fee: 0.0001,
     confirmations: 12,
+    status: RPCValueTransfersStatusEnum.confirmed,
     txid: 'shield-txid-1234567890',
     time: Date.now(),
     zecPrice: 33.33,