Persist chosen units across app restarts

components/AmountInput.tsx

@@ -25,10 +25,6 @@ interface AmountInputProps {
     FiatStore?: FiatStore;
     SettingsStore?: SettingsStore;
     UnitsStore?: UnitsStore;
-    // Quick fix for ZEUS-1580
-    // Prevents unit reset when Keysend is initiated from Keypad
-    // since unit depends on user selection and is not necessarily sats
-    preventUnitReset?: boolean;
 }
 
 interface AmountInputState {
@@ -85,13 +81,9 @@ export default class AmountInput extends React.Component<
     constructor(props: any) {
         super(props);
 
-        const { amount, onAmountChange, preventUnitReset } = props;
+        const { amount, onAmountChange } = props;
         let satAmount = '0';
-        if (amount && !preventUnitReset) {
-            // reset units to sats if amount is passed in
-            this.props.UnitsStore?.resetUnits();
-            satAmount = getSatAmount(amount).toString();
-        }
+        if (amount) satAmount = getSatAmount(amount).toString();
 
         onAmountChange(amount, satAmount);
         this.state = {

stores/UnitsStore.ts

@@ -1,4 +1,6 @@
 import { action, observable } from 'mobx';
+import EncryptedStorage from 'react-native-encrypted-storage';
+
 import SettingsStore from './SettingsStore';
 import FiatStore from './FiatStore';
 import FeeUtils from './../utils/FeeUtils';
@@ -8,6 +10,8 @@ type Units = 'sats' | 'BTC' | 'fiat';
 // 100_000_000
 export const SATS_PER_BTC = 100000000;
 
+const UNIT_KEY = 'zeus-units';
+
 interface ValueDisplayProps {
     amount: string;
     unit: Units;
@@ -19,17 +23,26 @@ interface ValueDisplayProps {
 }
 
 export default class UnitsStore {
-    @observable public units: Units = 'sats';
+    @observable public units: Units | string = 'sats';
     settingsStore: SettingsStore;
     fiatStore: FiatStore;
 
     constructor(settingsStore: SettingsStore, fiatStore: FiatStore) {
         this.settingsStore = settingsStore;
         this.fiatStore = fiatStore;
+        this.getUnits();
     }
 
+    getUnits = async () => {
+        const units = await EncryptedStorage.getItem(UNIT_KEY);
+        if (units) this.units = units;
+    };
+
     @action
-    public changeUnits = () => (this.units = this.getNextUnit());
+    public changeUnits = async () => {
+        this.units = this.getNextUnit();
+        await EncryptedStorage.setItem(UNIT_KEY, this.units);
+    };
 
     public getNextUnit = () => {
         const { settings } = this.settingsStore;

utils/AddressUtils.test.ts

@@ -1,3 +1,10 @@
+jest.mock('react-native-encrypted-storage', () => ({
+    setItem: jest.fn(() => Promise.resolve()),
+    getItem: jest.fn(() => Promise.resolve()),
+    removeItem: jest.fn(() => Promise.resolve()),
+    clear: jest.fn(() => Promise.resolve())
+}));
+
 import AddressUtils from './AddressUtils';
 
 describe('AddressUtils', () => {

utils/handleAnything.ts

@@ -10,7 +10,7 @@ import NodeUriUtils from './NodeUriUtils';
 import { localeString } from './LocaleUtils';
 import BackendUtils from './BackendUtils';
 
-const { nodeInfoStore, invoicesStore, settingsStore } = stores;
+const { nodeInfoStore, invoicesStore, unitsStore, settingsStore } = stores;
 
 const isClipboardValue = (data: string) =>
     handleAnything(data, undefined, true);
@@ -56,6 +56,7 @@ const handleAnything = async (
         AddressUtils.isValidBitcoinAddress(value, isTestNet || isRegTest)
     ) {
         if (isClipboardValue) return true;
+        if (amount) unitsStore?.resetUnits();
         return [
             'Send',
             {

views/LnurlPay/LnurlPay.tsx

@@ -276,7 +276,6 @@ export default class LnurlPay extends React.Component<
                         <View style={{ marginTop: -20 }}>
                             <AmountInput
                                 amount={amount}
-                                preventUnitReset={true}
                                 locked={
                                     lnurl &&
                                     lnurl.minSendable === lnurl.maxSendable

views/Send.tsx

@@ -84,7 +84,6 @@ interface SendState {
     enableAtomicMultiPathPayment: boolean;
     clipboard: string;
     loading: boolean;
-    preventUnitReset: boolean;
     contactName: string;
 }
 
@@ -107,7 +106,6 @@ export default class Send extends React.Component<SendProps, SendState> {
         const amount = navigation.getParam('amount', null);
         const transactionType = navigation.getParam('transactionType', null);
         const isValid = navigation.getParam('isValid', false);
-        const preventUnitReset = navigation.getParam('preventUnitReset', false);
         const contactName = navigation.getParam('contactName', null);
 
         if (transactionType === 'Lightning') {
@@ -132,7 +130,6 @@ export default class Send extends React.Component<SendProps, SendState> {
             enableAtomicMultiPathPayment: false,
             clipboard: '',
             loading: false,
-            preventUnitReset,
             contactName
         };
     }
@@ -405,7 +402,6 @@ export default class Send extends React.Component<SendProps, SendState> {
             enableAtomicMultiPathPayment,
             clipboard,
             loading,
-            preventUnitReset,
             contactName
         } = this.state;
         const {
@@ -724,7 +720,6 @@ export default class Send extends React.Component<SendProps, SendState> {
                             <React.Fragment>
                                 <AmountInput
                                     amount={amount}
-                                    preventUnitReset={preventUnitReset}
                                     title={localeString('views.Send.amount')}
                                     onAmountChange={(
                                         amount: string,

views/Wallet/KeypadPane.tsx

@@ -444,8 +444,7 @@ export default class KeypadPane extends React.PureComponent<
                                     noUppercase
                                     onPress={() => {
                                         navigation.navigate('Send', {
-                                            amount,
-                                            preventUnitReset: true
+                                            amount
                                         });
                                     }}
                                     buttonStyle={{ height: 40 }}