Safe communication

.devcontainer/devcontainer.json

@@ -9,7 +9,7 @@
 	"features": {
 		"ghcr.io/devcontainers/features/java:1": {
 			"installGradle": true,
-			"version": "17",
+			"version": "18",
 			"jdkDistro": "open",
 			"gradleVersion": "latest",
 			"mavenVersion": "latest",

.github/workflows/android-macos-integration-test.yaml

@@ -143,7 +143,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '18'
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3

.github/workflows/android-ubuntu-e2e-test-ci.yaml

@@ -220,7 +220,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '18'
 
       - name: Gradle cache
         uses: gradle/actions/setup-gradle@v4

.github/workflows/android-ubuntu-integration-test-ci.yaml

@@ -201,7 +201,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '18'
 
       - name: Gradle cache
         uses: gradle/actions/setup-gradle@v4

.github/workflows/old/android-e2e-test-actions.yaml

@@ -48,7 +48,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '18'
 
       - name: Gradle cache
         uses: gradle/actions/setup-gradle@v4

.github/workflows/old/android-e2e-test-script.yaml

@@ -194,7 +194,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '18'
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3

.github/workflows/old/android-ubuntu-integration-test.yaml

@@ -170,7 +170,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '18'
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3

__mocks__/dataMocks/mockAddresses.ts

@@ -2,19 +2,19 @@ import { AddressClass, AddressKindEnum, ReceiverEnum } from '../../app/AppState'
 
 export const mockAddresses: AddressClass[] = [
   {
-    uaAddress: 'UA-12345678901234567890',
+    uOrchardAddress: 'UA-12345678901234567890',
     address: 'UA-12345678901234567890',
     addressKind: AddressKindEnum.u,
     receivers: ReceiverEnum.o + ReceiverEnum.z + ReceiverEnum.t,
   },
   {
-    uaAddress: 'UA-12345678901234567890',
+    uOrchardAddress: 'UA-12345678901234567890',
     address: 'sapling-12345678901234567890',
     addressKind: AddressKindEnum.z,
     receivers: ReceiverEnum.z,
   },
   {
-    uaAddress: 'UA-12345678901234567890',
+    uOrchardAddress: 'UA-12345678901234567890',
     address: 'transparent-12345678901234567890',
     addressKind: AddressKindEnum.t,
     receivers: ReceiverEnum.t,

__tests__/App.snapshot.tsx

@@ -40,7 +40,7 @@ jest.mock('react-native', () => {
 
   RN.NativeModules.RPCModule = {
     execute: jest.fn(() => '{}'),
-    getValueTransfersList: jest.fn(() => '{ "value_transfers": [] }'),
+    getValueTransfersList: jest.fn(() => '{ "value_transfers": [], "total": 0 }'),
   };
 
   return RN;

__tests__/Components.unit.tsx

@@ -32,48 +32,42 @@ describe('Component Components - test', () => {
       <CurrencyAmount price={2.9826} amtZec={1.00098} style={{}} currency={CurrencyEnum.USDCurrency} privacy={true} />,
     ).toJSON();
     expect(text.type).toBe('View');
-    expect(text.children[0].children[0].children[0].children[0]).toBe('$');
-    expect(text.children[0].children[0].children[1].children[0]).toBe(' -.--');
+    expect(text.children[0].children[0].children[0].children[0]).toBe('$ -.--');
   });
   test('CurrencyAmount - price undefined result $ -- USD', () => {
     const text: any = render(<CurrencyAmount amtZec={1} style={{}} currency={CurrencyEnum.USDCurrency} />).toJSON();
     expect(text.type).toBe('View');
-    expect(text.children[0].children[0].children[0].children[0]).toBe('$');
-    expect(text.children[0].children[0].children[1].children[0]).toBe(' -.--');
+    expect(text.children[0].children[0].children[0].children[0]).toBe('$ -.--');
   });
 
   test('CurrencyAmount - price 0 result $ -- USD', () => {
     const text: any = render(
       <CurrencyAmount price={0} amtZec={1} style={{}} currency={CurrencyEnum.USDCurrency} />,
     ).toJSON();
     expect(text.type).toBe('View');
-    expect(text.children[0].children[0].children[0].children[0]).toBe('$');
-    expect(text.children[0].children[0].children[1].children[0]).toBe(' -.--');
+    expect(text.children[0].children[0].children[0].children[0]).toBe('$ -.--');
   });
 
   test('CurrencyAmount - amtZec undefined result $ -- USD', () => {
     const text: any = render(<CurrencyAmount price={1} style={{}} currency={CurrencyEnum.USDCurrency} />).toJSON();
     expect(text.type).toBe('View');
-    expect(text.children[0].children[0].children[0].children[0]).toBe('$');
-    expect(text.children[0].children[0].children[1].children[0]).toBe(' -.--');
+    expect(text.children[0].children[0].children[0].children[0]).toBe('$ -.--');
   });
 
   test('CurrencyAmount - price * amtZec really tiny result $ < 0.01 USD', () => {
     const text: any = render(
       <CurrencyAmount price={0.001} amtZec={1} style={{}} currency={CurrencyEnum.USDCurrency} />,
     ).toJSON();
     expect(text.type).toBe('View');
-    expect(text.children[0].children[0].children[0].children[0]).toBe('$');
-    expect(text.children[0].children[0].children[1].children[0]).toBe(' < 0.01');
+    expect(text.children[0].children[0].children[0].children[0]).toBe('$ < 0.01');
   });
 
   test('CurrencyAmount - price=2.9826 and amtZec=1.00098 result $ 2.99 USD', () => {
     const text: any = render(
       <CurrencyAmount price={2.9826} amtZec={1.00098} style={{}} currency={CurrencyEnum.USDCurrency} />,
     ).toJSON();
     expect(text.type).toBe('View');
-    expect(text.children[0].children[0].children[0].children[0]).toBe('$');
-    expect(text.children[0].children[0].children[1].children[0]).toBe(' 2.99');
+    expect(text.children[0].children[0].children[0].children[0]).toBe('$ 2.99');
   });
 
   test("CurrencyAmount - style={backgroundColor: 'red'} result same", () => {
@@ -87,7 +81,6 @@ describe('Component Components - test', () => {
     ).toJSON();
     expect(text.type).toBe('View');
     expect(text.children[0].children[0].children[0].props.style.backgroundColor).toBe('red');
-    expect(text.children[0].children[0].children[1].props.style.backgroundColor).toBe('red');
   });
 
   test('ZecAmount - High Privacy - amtZec -1.123456789 rounded up result -.---- ZEC', () => {

__tests__/History.snapshot.tsx

@@ -116,7 +116,7 @@ describe('Component History - test', () => {
   //snapshot test
   const state = defaultAppContextLoaded;
   state.valueTransfers = mockValueTransfers;
-  state.uaAddress = mockAddresses[0].uaAddress;
+  state.uOrchardAddress = mockAddresses[0].uOrchardAddress;
   state.addresses = mockAddresses;
   state.translate = mockTranslate;
   state.info = mockInfo;
@@ -146,6 +146,9 @@ describe('Component History - test', () => {
           scrollToTop={false}
           setScrollToBottom={onFunction}
           scrollToBottom={false}
+          sendTransaction={onFunction}
+          clearToAddr={onFunction}
+          setServerOption={onFunction}
         />
       </ContextAppLoadedProvider>,
     );
@@ -175,6 +178,9 @@ describe('Component History - test', () => {
           scrollToTop={false}
           setScrollToBottom={onFunction}
           scrollToBottom={false}
+          sendTransaction={onFunction}
+          clearToAddr={onFunction}
+          setServerOption={onFunction}
         />
       </ContextAppLoadedProvider>,
     );

__tests__/Info.es.unit.tsx

@@ -59,6 +59,6 @@ describe('Component Info - test', () => {
         <Info closeModal={onClose} setZecPrice={onSet} />
       </ContextAppLoadedProvider>,
     );
-    screen.getByText('33,33');
+    screen.getByText('$ 33,33');
   });
 });

__tests__/Info.us.unit.tsx

@@ -59,6 +59,6 @@ describe('Component Info - test', () => {
         <Info closeModal={onClose} setZecPrice={onSet} />
       </ContextAppLoadedProvider>,
     );
-    screen.getByText('33.33');
+    screen.getByText('$ 33.33');
   });
 });

__tests__/LoadedApp.snapshot.tsx

@@ -64,7 +64,7 @@ jest.mock('react-native', () => {
 
   RN.NativeModules.RPCModule = {
     execute: jest.fn(() => '[]'),
-    getValueTransfersList: jest.fn(() => '{ "value_transfers": [] }'),
+    getValueTransfersList: jest.fn(() => '{ "value_transfers": [], "total": 0 }'),
   };
 
   return RN;

__tests__/LoadingApp.snapshot.tsx

@@ -65,7 +65,7 @@ jest.mock('react-native', () => {
     execute: jest.fn(() => '{}'),
     getLatestBlock: jest.fn(() => '{}'),
     walletExists: jest.fn(() => 'false'),
-    getValueTransfersList: jest.fn(() => '{ "value_transfers": [] }'),
+    getValueTransfersList: jest.fn(() => '{ "value_transfers": [], "total": 0 }'),
     setCryptoDefaultProvider: jest.fn(() => 'true'),
   };
 

__tests__/Memo.snapshot.tsx

@@ -53,7 +53,7 @@ describe('Component Memo - test', () => {
     const onClose = jest.fn();
     const memo = render(
       <ContextAppLoadedProvider value={state}>
-        <Memo closeModal={onClose} updateToField={onClose} />
+        <Memo closeModal={onClose} memoUpdateToField={onClose} />
       </ContextAppLoadedProvider>,
     );
     expect(memo.toJSON()).toMatchSnapshot();

__tests__/Messages.snapshot.tsx

@@ -95,7 +95,7 @@ describe('Component Messages - test', () => {
   //snapshot test
   const state = defaultAppContextLoaded;
   state.valueTransfers = mockValueTransfers;
-  state.uaAddress = mockAddresses[0].uaAddress;
+  state.uOrchardAddress = mockAddresses[0].uOrchardAddress;
   state.addresses = mockAddresses;
   state.translate = mockTranslate;
   state.info = mockInfo;
@@ -119,6 +119,11 @@ describe('Component Messages - test', () => {
           setSendPageState={onFunction}
           setScrollToBottom={onFunction}
           scrollToBottom={false}
+          setScrollToTop={onFunction}
+          scrollToTop={false}
+          sendTransaction={onFunction}
+          clearToAddr={onFunction}
+          setServerOption={onFunction}
         />
       </ContextAppLoadedProvider>,
     );
@@ -142,6 +147,11 @@ describe('Component Messages - test', () => {
           setSendPageState={onFunction}
           setScrollToBottom={onFunction}
           scrollToBottom={false}
+          setScrollToTop={onFunction}
+          scrollToTop={false}
+          sendTransaction={onFunction}
+          clearToAddr={onFunction}
+          setServerOption={onFunction}
         />
       </ContextAppLoadedProvider>,
     );

__tests__/MessagesAddress.snapshot.tsx

@@ -95,7 +95,7 @@ describe('Component Messages Address - test', () => {
   //snapshot test
   const state = defaultAppContextLoaded;
   state.valueTransfers = mockValueTransfers;
-  state.uaAddress = mockAddresses[0].uaAddress;
+  state.uOrchardAddress = mockAddresses[0].uOrchardAddress;
   state.addresses = mockAddresses;
   state.translate = mockTranslate;
   state.info = mockInfo;
@@ -113,15 +113,16 @@ describe('Component Messages Address - test', () => {
       <ContextAppLoadedProvider value={state}>
         <MessagesAddress
           doRefresh={onFunction}
-          toggleMenuDrawer={onFunction}
-          syncingStatusMoreInfoOnClick={onFunction}
           setPrivacyOption={onFunction}
           setSendPageState={onFunction}
           setScrollToBottom={onFunction}
           scrollToBottom={false}
-          address={mockAddresses[0].uaAddress}
+          address={mockAddresses[0].uOrchardAddress}
           closeModal={onFunction}
           openModal={onFunction}
+          sendTransaction={onFunction}
+          clearToAddr={onFunction}
+          setServerOption={onFunction}
         />
       </ContextAppLoadedProvider>,
     );

__tests__/Receive.snapshot.tsx

@@ -55,15 +55,15 @@ describe('Component Receive - test', () => {
   //snapshot test
   test('Receive - snapshot', () => {
     const state = defaultAppContextLoaded;
-    state.uaAddress = mockAddresses[0].uaAddress;
+    state.uOrchardAddress = mockAddresses[0].uOrchardAddress;
     state.addresses = mockAddresses;
     state.translate = mockTranslate;
     state.info = mockInfo;
     state.totalBalance = mockTotalBalance;
     const onFunction = jest.fn();
     const receive = render(
       <ContextAppLoadedProvider value={state}>
-        <Receive setUaAddress={onFunction} toggleMenuDrawer={onFunction} syncingStatusMoreInfoOnClick={onFunction} />
+        <Receive toggleMenuDrawer={onFunction} syncingStatusMoreInfoOnClick={onFunction} alone={false} />
       </ContextAppLoadedProvider>,
     );
     expect(receive.toJSON()).toMatchSnapshot();

__tests__/Scanner.snapshot.tsx

@@ -13,8 +13,7 @@ describe('Component Scanner - test', () => {
   //snapshot test
   test('Scanner - snapshot', () => {
     const onRead = jest.fn();
-    const doCancel = jest.fn();
-    const scanner = render(<Scanner onRead={onRead} doCancel={doCancel} title="title" button="button" />);
+    const scanner = render(<Scanner onRead={onRead} />);
     expect(scanner.toJSON()).toMatchSnapshot();
   });
 });

__tests__/Send.snapshot.tsx

@@ -67,7 +67,7 @@ describe('Component Send - test', () => {
   //snapshot test
   const state = defaultAppContextLoaded;
   state.valueTransfers = mockValueTransfers;
-  state.uaAddress = mockAddresses[0].uaAddress;
+  state.uOrchardAddress = mockAddresses[0].uOrchardAddress;
   state.addresses = mockAddresses;
   state.translate = mockTranslate;
   state.info = mockInfo;
@@ -89,7 +89,6 @@ describe('Component Send - test', () => {
           setSendPageState={onFunction}
           sendTransaction={onFunction}
           clearToAddr={onFunction}
-          setSendProgress={onFunction}
           toggleMenuDrawer={onFunction}
           setComputingModalVisible={onFunction}
           poolsMoreInfoOnClick={onFunction}
@@ -100,8 +99,6 @@ describe('Component Send - test', () => {
           setScrollToTop={onFunction}
           setScrollToBottom={onFunction}
           setServerOption={onFunction}
-          clearTimers={onFunction}
-          configure={onFunction}
         />
       </ContextAppLoadedProvider>,
     );
@@ -121,7 +118,6 @@ describe('Component Send - test', () => {
           setSendPageState={onFunction}
           sendTransaction={onFunction}
           clearToAddr={onFunction}
-          setSendProgress={onFunction}
           toggleMenuDrawer={onFunction}
           setComputingModalVisible={onFunction}
           poolsMoreInfoOnClick={onFunction}
@@ -132,8 +128,6 @@ describe('Component Send - test', () => {
           setScrollToTop={onFunction}
           setScrollToBottom={onFunction}
           setServerOption={onFunction}
-          clearTimers={onFunction}
-          configure={onFunction}
         />
       </ContextAppLoadedProvider>,
     );

__tests__/SingleAddress.snapshot.tsx

@@ -22,7 +22,7 @@ describe('Component SingleAddress - test', () => {
     const onPrev = jest.fn();
     const onNext = jest.fn();
     const single = render(
-      <SingleAddress address={mockAddresses[0].uaAddress} index={0} total={1} prev={onPrev} next={onNext} />,
+      <SingleAddress address={mockAddresses[0].uOrchardAddress} index={0} total={1} prev={onPrev} next={onNext} />,
     );
     expect(single.toJSON()).toMatchSnapshot();
   });