Merge branch 'dev_reply_to_only_orchard_UA' into dev_safe_communication

__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__/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;

__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;

__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;
@@ -117,7 +117,7 @@ describe('Component Messages Address - test', () => {
           setSendPageState={onFunction}
           setScrollToBottom={onFunction}
           scrollToBottom={false}
-          address={mockAddresses[0].uaAddress}
+          address={mockAddresses[0].uOrchardAddress}
           closeModal={onFunction}
           openModal={onFunction}
           sendTransaction={onFunction}

__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__/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;

__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();
   });

__tests__/__snapshots__/AddressBook.AbDetail.snapshot.tsx.snap

@@ -1187,28 +1187,6 @@ exports[`Component Address Book Details - test Address Book Datails - Modify - s
       </View>
     </View>
   </View>
-  <View
-    style={
-      {
-        "alignItems": "center",
-        "flexDirection": "row",
-        "flexGrow": 1,
-        "justifyContent": "center",
-        "marginVertical": 5,
-      }
-    }
-  >
-    <Text
-      style={
-        {
-          "color": "#18bd18",
-          "opacity": 0.65,
-        }
-      }
-    >
-      text translated
-    </Text>
-  </View>
   <View
     style={
       {
@@ -1225,7 +1203,7 @@ exports[`Component Address Book Details - test Address Book Datails - Modify - s
         {
           "busy": undefined,
           "checked": undefined,
-          "disabled": true,
+          "disabled": false,
           "expanded": undefined,
           "selected": undefined,
         }
@@ -1251,8 +1229,8 @@ exports[`Component Address Book Details - test Address Book Datails - Modify - s
       style={
         {
           "alignItems": "center",
-          "backgroundColor": "#5a8c5a",
-          "borderColor": "#5a8c5a",
+          "backgroundColor": "#18bd18",
+          "borderColor": "#c3c3c3",
           "borderRadius": 10,
           "borderWidth": 2,
           "justifyContent": "center",

__tests__/__snapshots__/Receive.snapshot.tsx.snap

@@ -7,11 +7,7 @@ exports[`Component Receive - test Receive - snapshot 1`] = `
       "index": 0,
       "routes": [
         {
-          "key": "uaddr",
-          "title": "text translated",
-        },
-        {
-          "key": "zaddr",
+          "key": "uorchardaddr",
           "title": "text translated",
         },
         {

android/app/build.gradle

@@ -107,7 +107,7 @@ android {
         applicationId 'org.ZingoLabs.Zingo' // Real
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 208 // Real
+        versionCode 209 // Real
         versionName "zingo-1.11.0" // Real
         missingDimensionStrategy 'react-native-camera', 'general'
         testBuildType System.getProperty('testBuildType', 'debug')

app/AppState/AppContextLoaded.ts

@@ -61,7 +61,7 @@ export default interface AppContextLoaded {
   wallet: WalletType;
 
   // active UA in the wallet
-  uaAddress: string;
+  uOrchardAddress: string;
 
   // zec price in USD from internet
   zecPrice: ZecPriceType;

app/AppState/classes/AddressBookFileClass.ts

@@ -1,9 +1,11 @@
 export default class AddressBookFileClass {
   label: string;
   address: string;
+  uOrchardAddress?: string;
 
-  constructor(label: string, address: string) {
+  constructor(label: string, address: string, uOrchardAddress?: string) {
     this.label = label;
     this.address = address;
+    this.uOrchardAddress = uOrchardAddress;
   }
 }

app/AppState/classes/AddressClass.ts

@@ -1,13 +1,13 @@
 import { AddressKindEnum } from '../enums/AddressKindEnum';
 
 export default class AddressClass {
-  uaAddress: string;
+  uOrchardAddress: string;
   address: string;
   addressKind: AddressKindEnum;
   receivers: string;
 
-  constructor(uaAddress: string, address: string, addressKind: AddressKindEnum, receivers: string) {
-    this.uaAddress = uaAddress;
+  constructor(uOrchardAddress: string, address: string, addressKind: AddressKindEnum, receivers: string) {
+    this.uOrchardAddress = uOrchardAddress;
     this.address = address;
     this.addressKind = addressKind;
     this.receivers = receivers;

app/AppState/const/GlobalConst.ts

@@ -21,4 +21,5 @@ export const GlobalConst = {
   background: '@background',
   keyKeyChain: 'ZINGO_SEED_BIRTHDAY',
   serviceKeyChain: 'ZINGO',
+  replyTo: '\nReply to: \n',
 };

app/AppState/enums/CommandAddressesEnum.ts

@@ -0,0 +1,5 @@
+export enum CommandAddressesEnum {
+  full = '',
+  shielded = 'shielded',
+  orchard = 'orchard',
+}

app/AppState/enums/ShieldedEnum.ts

@@ -0,0 +1,6 @@
+export enum ShieldedEnum {
+  uFull = 'uFull',
+  uOrchardSapling = 'uOrchardSapling',
+  uOrchard = 'uOrchard',
+  sapling = 'sapling',
+}

app/LoadedApp/LoadedApp.tsx

@@ -272,10 +272,35 @@ export default function LoadedApp(props: LoadedAppProps) {
       }
 
       // adding `Zenny Tips` address always.
-      const ab = await AddressBookFileImpl.writeAddressBookItem(
+      let ab = await AddressBookFileImpl.writeAddressBookItem(
         translate('zenny-tips-ab') as string,
         await Utils.getZenniesDonationAddress(server.chainName),
+        '',
       );
+
+      // reply-to change, from full UA to only orchard UA.
+      // we need to calculate the only orchard UA for all the
+      // contacts with a full UA stored in the Address Book.
+      // We need to identify the old transaction memos (with full UA)
+      // and we need to idenfify the new transaction memos (with only orchard UA)
+
+      // if some contact don't have the new field: `uOrchardAddress` then
+      // the App have to create and calculate it if needed.
+      const toUpdate = ab.filter((a: AddressBookFileClass) => !a.hasOwnProperty('uOrchardAddress'));
+      console.log('Address Book -> TO UPDATE', toUpdate);
+      if (toUpdate.length > 0) {
+        for (let i = 0; i < toUpdate.length; i++) {
+          const a = toUpdate[i];
+          const validAddress: { isValid: boolean; onlyOrchardUA: string } = await Utils.isValidAddress(
+            a.address,
+            server.chainName,
+          );
+          if (validAddress.isValid) {
+            //ab = await AddressBookFileImpl.removeAddressBookItem(a.label, a.address);
+            ab = await AddressBookFileImpl.writeAddressBookItem(a.label, a.address, validAddress.onlyOrchardUA);
+          }
+        }
+      }
       setAddressBook(ab);
 
       setLoading(false);
@@ -391,7 +416,7 @@ export class LoadedAppClass extends Component<LoadedAppClassProps, LoadedAppClas
         zecPrice: 0,
         date: 0,
       } as ZecPriceType,
-      uaAddress: '',
+      uOrchardAddress: '',
       sendPageState: new SendPageStateClass(new ToAddrClass(Utils.getNextToAddrID())),
       receivePageState: {} as ReceivePageStateClass,
       background: props.background,
@@ -913,11 +938,11 @@ export class LoadedAppClass extends Component<LoadedAppClassProps, LoadedAppClas
       this.setState({ addresses });
     }
     if (addresses.length > 0) {
-      if (this.state.uaAddress !== addresses[0].uaAddress) {
-        this.setState({ uaAddress: addresses[0].uaAddress });
+      if (this.state.uOrchardAddress !== addresses[0].uOrchardAddress) {
+        this.setState({ uOrchardAddress: addresses[0].uOrchardAddress });
       }
     } else {
-      this.setState({ uaAddress: '' });
+      this.setState({ uOrchardAddress: '' });
     }
   };
 
@@ -987,10 +1012,10 @@ export class LoadedAppClass extends Component<LoadedAppClassProps, LoadedAppClas
   sendTransaction = async (): Promise<String> => {
     try {
       // Construct a sendJson from the sendPage state
-      const { sendPageState, uaAddress, addresses, server, donation } = this.state;
+      const { sendPageState, uOrchardAddress, addresses, server, donation } = this.state;
       const sendJson = await Utils.getSendManyJSON(
         sendPageState,
-        uaAddress,
+        uOrchardAddress,
         addresses ? addresses : ([] as AddressClass[]),
         server,
         donation,
@@ -1523,10 +1548,6 @@ export class LoadedAppClass extends Component<LoadedAppClassProps, LoadedAppClas
     }
   };
 
-  setUaAddress = (uaAddress: string) => {
-    this.setState({ uaAddress });
-  };
-
   syncingStatusMoreInfoOnClick = async () => {
     await this.fetchWallet();
     this.setState({ syncReportModalVisible: true });
@@ -1633,7 +1654,7 @@ export class LoadedAppClass extends Component<LoadedAppClassProps, LoadedAppClas
       syncingStatus: this.state.syncingStatus,
       info: this.state.info,
       zecPrice: this.state.zecPrice,
-      uaAddress: this.state.uaAddress,
+      uOrchardAddress: this.state.uOrchardAddress,
       sendPageState: this.state.sendPageState,
       receivePageState: this.state.receivePageState,
       background: this.state.background,
@@ -2048,10 +2069,10 @@ export class LoadedAppClass extends Component<LoadedAppClassProps, LoadedAppClas
               <Tab.Screen name={translate('loadedapp.receive-menu') as string}>
                 {() => (
                   <Receive
-                    setUaAddress={this.setUaAddress}
                     toggleMenuDrawer={this.toggleMenuDrawer}
                     syncingStatusMoreInfoOnClick={this.syncingStatusMoreInfoOnClick}
                     setUfvkViewModalVisible={this.setUfvkViewModalVisible}
+                    alone={false}
                   />
                 )}
               </Tab.Screen>
@@ -2093,10 +2114,10 @@ export class LoadedAppClass extends Component<LoadedAppClassProps, LoadedAppClas
                   <Tab.Screen name={translate('loadedapp.history-menu') as string}>
                     {() => (
                       <Receive
-                        setUaAddress={this.setUaAddress}
                         toggleMenuDrawer={this.toggleMenuDrawer}
                         syncingStatusMoreInfoOnClick={this.syncingStatusMoreInfoOnClick}
                         setUfvkViewModalVisible={this.setUfvkViewModalVisible}
+                        alone={true}
                       />
                     )}
                   </Tab.Screen>

app/context/contextAppLoaded.tsx

@@ -37,7 +37,7 @@ export const defaultAppContextLoaded: AppContextLoaded = {
   info: {} as InfoType,
   walletSettings: new WalletSettingsClass(),
   wallet: {} as WalletType,
-  uaAddress: '',
+  uOrchardAddress: '',
   server: {} as ServerType,
   currency: CurrencyEnum.noCurrency,
   language: LanguageEnum.en,