bump version

correct settleAmount formatting for non-US locales (#791 )
bump version
2025-09-03 08:23:04 +02:00 · 2021-10-27 08:37:52 +02:00 · 2021-10-26 17:36:03 +02:00 · 2021-09-08 13:53:57 +02:00 · 2021-09-08 13:52:23 +02:00 · 2021-09-05 21:58:19 +02:00
102 changed files with 4330 additions and 2031 deletions
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -171,6 +171,10 @@ add_library(wallet-crypto STATIC IMPORTED)
 set_target_properties(wallet-crypto PROPERTIES IMPORTED_LOCATION
        ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libwallet-crypto.a)

+add_library(cryptonote_format_utils_basic STATIC IMPORTED)
+set_target_properties(cryptonote_format_utils_basic PROPERTIES IMPORTED_LOCATION
+        ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libcryptonote_format_utils_basic.a)
+
 #############
 # System
 #############
@@ -193,6 +197,7 @@ target_link_libraries(  monerujo
                        wallet
                        cryptonote_core
                        cryptonote_basic
+                        cryptonote_format_utils_basic
                        mnemonics
                        ringct
                        ringct_basic
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,14 +1,15 @@
 apply plugin: 'com.android.application'

 android {
-    compileSdkVersion 29
-    buildToolsVersion '29.0.3'
+    compileSdkVersion 30
+    buildToolsVersion '30.0.3'
+    ndkVersion '17.2.4988734'
    defaultConfig {
        applicationId "com.m2049r.xmrwallet"
        minSdkVersion 21
-        targetSdkVersion 29
-        versionCode 712
-        versionName "1.17.12 'Druk'"
+        targetSdkVersion 30
+        versionCode 1102
+        versionName "2.1.2 'Vertant'"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        externalNativeBuild {
            cmake {
@@ -123,14 +124,14 @@ dependencies {
    implementation 'androidx.appcompat:appcompat:1.2.0'
    implementation 'com.google.android.material:material:1.3.0'
    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.0'
    implementation 'androidx.cardview:cardview:1.0.0'
    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01'
    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'

    implementation 'me.dm7.barcodescanner:zxing:1.9.8'
    implementation "com.squareup.okhttp3:okhttp:4.9.0"
-    implementation "com.burgstaller:okhttp-digest:2.1"
+    implementation "io.github.rburgst:okhttp-digest:2.5"
    implementation "com.jakewharton.timber:timber:4.7.1"

    implementation 'com.nulab-inc:zxcvbn:1.3.0'
@@ -140,8 +141,6 @@ dependencies {
    implementation 'org.slf4j:slf4j-nop:1.7.30'
    implementation 'com.github.brnunes:swipeablerecyclerview:1.0.2'

-    implementation 'com.github.aelstad:keccakj:1.1.0'
-
    testImplementation "junit:junit:$rootProject.ext.junitVersion"
    testImplementation "org.mockito:mockito-all:$rootProject.ext.mockitoVersion"
    testImplementation "com.squareup.okhttp3:mockwebserver:4.9.0"
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,20 +4,19 @@

    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
    <uses-permission android:name="android.permission.WAKE_LOCK" />
    <uses-permission android:name="android.permission.CAMERA" />
    <uses-permission android:name="android.permission.USE_BIOMETRIC" />
-    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
    <uses-permission android:name="android.permission.NFC" />
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

    <application
-        android:requestLegacyExternalStorage="true"
        android:name=".XmrWalletApplication"
        android:allowBackup="false"
        android:icon="@mipmap/ic_launcher"
        android:label="@string/app_name"
+        android:preserveLegacyExternalStorage="true"
        android:supportsRtl="true"
        android:theme="@style/MyMaterialTheme"
        android:usesCleartextTraffic="true">
@@ -36,7 +35,7 @@
            android:configChanges="orientation|keyboardHidden|uiMode"
            android:label="@string/wallet_activity_name"
            android:launchMode="singleTask"
-            android:screenOrientation="behind"/>
+            android:screenOrientation="behind" />
        <activity
            android:name=".LoginActivity"
            android:configChanges="orientation|keyboardHidden|uiMode"
--- a/app/src/main/cpp/monerujo.cpp
+++ b/app/src/main/cpp/monerujo.cpp
@@ -914,7 +914,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_refreshAsync(JNIEnv *env, jobject instanc

 //virtual void rescanBlockchainAsync() = 0;
 JNIEXPORT void JNICALL
-Java_com_m2049r_xmrwallet_model_Wallet_rescanBlockchainAsync(JNIEnv *env, jobject instance) {
+Java_com_m2049r_xmrwallet_model_Wallet_rescanBlockchainAsyncJ(JNIEnv *env, jobject instance) {
    Bitmonero::Wallet *wallet = getHandle<Bitmonero::Wallet>(env, instance);
    wallet->rescanBlockchainAsync();
 }
--- a/app/src/main/java/com/m2049r/xmrwallet/BaseActivity.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/BaseActivity.java
@@ -31,10 +31,11 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.PowerManager;
+import android.widget.Toast;
+
 import androidx.annotation.CallSuper;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import android.widget.Toast;

 import com.m2049r.xmrwallet.data.BarcodeData;
 import com.m2049r.xmrwallet.dialog.ProgressDialog;
@@ -46,7 +47,8 @@ import java.io.IOException;

 import timber.log.Timber;

-public class BaseActivity extends SecureActivity implements GenerateReviewFragment.ProgressListener {
+public class BaseActivity extends SecureActivity
+        implements GenerateReviewFragment.ProgressListener, SubaddressFragment.ProgressListener {

    ProgressDialog progressDialog = null;

--- a/app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java
@@ -307,7 +307,6 @@ public class GenerateReviewFragment extends Fragment {
        void dismissProgressDialog();
    }

-
    public interface AcceptListener {
        void onAccept(String name, String password);
    }
--- a/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java
--- a/app/src/main/java/com/m2049r/xmrwallet/LoginFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/LoginFragment.java
@@ -31,7 +31,6 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-import android.widget.Toast;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -62,8 +61,7 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter

    private WalletInfoAdapter adapter;

-    private List<WalletManager.WalletInfo> walletList = new ArrayList<>();
-    private List<WalletManager.WalletInfo> displayedList = new ArrayList<>();
+    private final List<WalletManager.WalletInfo> walletList = new ArrayList<>();

    private View tvGuntherSays;
    private ImageView ivGunther;
@@ -82,13 +80,15 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter

        void onWalletDetails(String wallet);

-        void onWalletReceive(String wallet);
-
        void onWalletRename(String name);

        void onWalletBackup(String name);

-        void onWalletArchive(String walletName);
+        void onWalletRestore();
+
+        void onWalletDelete(String walletName);
+
+        void onWalletDeleteCache(String walletName);

        void onAddWallet(String type);

@@ -112,7 +112,7 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
    }

    @Override
-    public void onAttach(Context context) {
+    public void onAttach(@NonNull Context context) {
        super.onAttach(context);
        if (context instanceof Listener) {
            this.activityCallback = (Listener) context;
@@ -202,12 +202,7 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
    // Wallet touched
    @Override
    public void onInteraction(final View view, final WalletManager.WalletInfo infoItem) {
-        String addressPrefix = WalletManager.getInstance().addressPrefix();
-        if (addressPrefix.indexOf(infoItem.address.charAt(0)) < 0) {
-            Toast.makeText(getActivity(), getString(R.string.prompt_wrong_net), Toast.LENGTH_LONG).show();
-            return;
-        }
-        openWallet(infoItem.name, false);
+        openWallet(infoItem.getName(), false);
    }

    private void openWallet(String name, boolean streetmode) {
@@ -216,51 +211,34 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter

    @Override
    public boolean onContextInteraction(MenuItem item, WalletManager.WalletInfo listItem) {
-        switch (item.getItemId()) {
-            case R.id.action_streetmode:
-                openWallet(listItem.name, true);
-                break;
-            case R.id.action_info:
-                showInfo(listItem.name);
-                break;
-            case R.id.action_receive:
-                showReceive(listItem.name);
-                break;
-            case R.id.action_rename:
-                activityCallback.onWalletRename(listItem.name);
-                break;
-            case R.id.action_backup:
-                activityCallback.onWalletBackup(listItem.name);
-                break;
-            case R.id.action_archive:
-                activityCallback.onWalletArchive(listItem.name);
-                break;
-            default:
-                return super.onContextItemSelected(item);
+        final int id = item.getItemId();
+        if (id == R.id.action_streetmode) {
+            openWallet(listItem.getName(), true);
+        } else if (id == R.id.action_info) {
+            showInfo(listItem.getName());
+        } else if (id == R.id.action_rename) {
+            activityCallback.onWalletRename(listItem.getName());
+        } else if (id == R.id.action_backup) {
+            activityCallback.onWalletBackup(listItem.getName());
+        } else if (id == R.id.action_archive) {
+            activityCallback.onWalletDelete(listItem.getName());
+        } else if (id == R.id.action_deletecache) {
+            activityCallback.onWalletDeleteCache(listItem.getName());
+        } else {
+            return super.onContextItemSelected(item);
        }
        return true;
    }

-    private void filterList() {
-        displayedList.clear();
-        String addressPrefix = WalletManager.getInstance().addressPrefix();
-        for (WalletManager.WalletInfo s : walletList) {
-            if (addressPrefix.indexOf(s.address.charAt(0)) >= 0) displayedList.add(s);
-        }
-    }
-
    public void loadList() {
        Timber.d("loadList()");
        WalletManager mgr = WalletManager.getInstance();
-        List<WalletManager.WalletInfo> walletInfos =
-                mgr.findWallets(activityCallback.getStorageRoot());
        walletList.clear();
-        walletList.addAll(walletInfos);
-        filterList();
-        adapter.setInfos(displayedList);
+        walletList.addAll(mgr.findWallets(activityCallback.getStorageRoot()));
+        adapter.setInfos(walletList);

        // deal with Gunther & FAB animation
-        if (displayedList.isEmpty()) {
+        if (walletList.isEmpty()) {
            fab.startAnimation(fab_pulse);
            if (ivGunther.getDrawable() == null) {
                ivGunther.setImageResource(R.drawable.ic_emptygunther);
@@ -279,7 +257,7 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
                .getSharedPreferences(KeyStoreHelper.SecurityConstants.WALLET_PASS_PREFS_NAME, Context.MODE_PRIVATE)
                .getAll().keySet();
        for (WalletManager.WalletInfo s : walletList) {
-            removedWallets.remove(s.name);
+            removedWallets.remove(s.getName());
        }
        for (String name : removedWallets) {
            KeyStoreHelper.removeWalletUserPass(getActivity(), name);
@@ -290,10 +268,6 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
        activityCallback.onWalletDetails(name);
    }

-    private void showReceive(@NonNull String name) {
-        activityCallback.onWalletReceive(name);
-    }
-
    @Override
    public void onCreate(@Nullable Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
@@ -301,7 +275,7 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
    }

    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+    public void onCreateOptionsMenu(@NonNull Menu menu, MenuInflater inflater) {
        inflater.inflate(R.menu.list_menu, menu);
        super.onCreateOptionsMenu(menu, inflater);
    }
@@ -371,37 +345,29 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter

    @Override
    public void onClick(View v) {
-        int id = v.getId();
+        final int id = v.getId();
        Timber.d("onClick %d/%d", id, R.id.fabLedger);
-        switch (id) {
-            case R.id.fab:
-                animateFAB();
-                break;
-            case R.id.fabNew:
-                fabScreen.setVisibility(View.INVISIBLE);
-                isFabOpen = false;
-                activityCallback.onAddWallet(GenerateFragment.TYPE_NEW);
-                break;
-            case R.id.fabView:
-                animateFAB();
-                activityCallback.onAddWallet(GenerateFragment.TYPE_VIEWONLY);
-                break;
-            case R.id.fabKey:
-                animateFAB();
-                activityCallback.onAddWallet(GenerateFragment.TYPE_KEY);
-                break;
-            case R.id.fabSeed:
-                animateFAB();
-                activityCallback.onAddWallet(GenerateFragment.TYPE_SEED);
-                break;
-            case R.id.fabLedger:
-                Timber.d("FAB_LEDGER");
-                animateFAB();
-                activityCallback.onAddWallet(GenerateFragment.TYPE_LEDGER);
-                break;
-            case R.id.fabScreen:
-                animateFAB();
-                break;
+        if (id == R.id.fab) {
+            animateFAB();
+        } else if (id == R.id.fabNew) {
+            fabScreen.setVisibility(View.INVISIBLE);
+            isFabOpen = false;
+            activityCallback.onAddWallet(GenerateFragment.TYPE_NEW);
+        } else if (id == R.id.fabView) {
+            animateFAB();
+            activityCallback.onAddWallet(GenerateFragment.TYPE_VIEWONLY);
+        } else if (id == R.id.fabKey) {
+            animateFAB();
+            activityCallback.onAddWallet(GenerateFragment.TYPE_KEY);
+        } else if (id == R.id.fabSeed) {
+            animateFAB();
+            activityCallback.onAddWallet(GenerateFragment.TYPE_SEED);
+        } else if (id == R.id.fabLedger) {
+            Timber.d("FAB_LEDGER");
+            animateFAB();
+            activityCallback.onAddWallet(GenerateFragment.TYPE_LEDGER);
+        } else if (id == R.id.fabScreen) {
+            animateFAB();
        }
    }

--- a/app/src/main/java/com/m2049r/xmrwallet/NodeFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/NodeFragment.java
@@ -228,24 +228,23 @@ public class NodeFragment extends Fragment

    // open up edit dialog
    @Override
-    public void onLongInteraction(final View view, final NodeInfo nodeItem) {
+    public boolean onLongInteraction(final View view, final NodeInfo nodeItem) {
        Timber.d("onLongInteraction");
        EditDialog diag = createEditDialog(nodeItem);
        if (diag != null) {
            diag.show();
        }
+        return true;
    }

    @Override
    public void onClick(View v) {
        int id = v.getId();
-        switch (id) {
-            case R.id.fab:
-                EditDialog diag = createEditDialog(null);
-                if (diag != null) {
-                    diag.show();
-                }
-                break;
+        if (id == R.id.fab) {
+            EditDialog diag = createEditDialog(null);
+            if (diag != null) {
+                diag.show();
+            }
        }
    }

--- a/app/src/main/java/com/m2049r/xmrwallet/OnBlockUpdateListener.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/OnBlockUpdateListener.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2021 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.xmrwallet;
+
+import com.m2049r.xmrwallet.model.Wallet;
+
+public interface OnBlockUpdateListener {
+    void onBlockUpdate(final Wallet wallet);
+}
--- a/app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java
--- a/app/src/main/java/com/m2049r/xmrwallet/SubaddressFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/SubaddressFragment.java
@@ -0,0 +1,251 @@
+/*
+ * Copyright (c) 2017 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.xmrwallet;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.transition.MaterialElevationScale;
+import com.m2049r.xmrwallet.data.Subaddress;
+import com.m2049r.xmrwallet.layout.SubaddressInfoAdapter;
+import com.m2049r.xmrwallet.ledger.LedgerProgressDialog;
+import com.m2049r.xmrwallet.model.TransactionInfo;
+import com.m2049r.xmrwallet.model.Wallet;
+import com.m2049r.xmrwallet.model.WalletManager;
+import com.m2049r.xmrwallet.util.Helper;
+import com.m2049r.xmrwallet.util.MoneroThreadPoolExecutor;
+import com.m2049r.xmrwallet.widget.Toolbar;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import timber.log.Timber;
+
+public class SubaddressFragment extends Fragment implements SubaddressInfoAdapter.OnInteractionListener,
+        View.OnClickListener, OnBlockUpdateListener {
+    static public final String KEY_MODE = "mode";
+    static public final String MODE_MANAGER = "manager";
+
+    private SubaddressInfoAdapter adapter;
+
+    private Listener activityCallback;
+
+    private Wallet wallet;
+
+    // Container Activity must implement this interface
+    public interface Listener {
+        void onSubaddressSelected(Subaddress subaddress);
+
+        void setSubtitle(String title);
+
+        void setToolbarButton(int type);
+
+        void showSubaddress(View view, final int subaddressIndex);
+    }
+
+    public interface ProgressListener {
+        void showProgressDialog(int msgId);
+
+        void showLedgerProgressDialog(int mode);
+
+        void dismissProgressDialog();
+    }
+
+    private ProgressListener progressCallback = null;
+
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+        if (context instanceof ProgressListener) {
+            progressCallback = (ProgressListener) context;
+        }
+        if (context instanceof Listener) {
+            activityCallback = (Listener) context;
+        } else {
+            throw new ClassCastException(context.toString()
+                    + " must implement Listener");
+        }
+    }
+
+    @Override
+    public void onPause() {
+        Timber.d("onPause()");
+        super.onPause();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        activityCallback.setSubtitle(getString(R.string.subbaddress_title));
+        activityCallback.setToolbarButton(Toolbar.BUTTON_BACK);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        Timber.d("onCreateView");
+
+        final Bundle b = getArguments();
+        managerMode = ((b != null) && (MODE_MANAGER.equals(b.getString(KEY_MODE))));
+
+        View view = inflater.inflate(R.layout.fragment_subaddress, container, false);
+
+        final MaterialElevationScale exitTransition = new MaterialElevationScale(false);
+        exitTransition.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
+        setExitTransition(exitTransition);
+        final MaterialElevationScale reenterTransition = new MaterialElevationScale(true);
+        reenterTransition.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
+        setReenterTransition(reenterTransition);
+
+        view.findViewById(R.id.fab).setOnClickListener(this);
+
+        if (managerMode) {
+            view.findViewById(R.id.tvInstruction).setVisibility(View.GONE);
+            view.findViewById(R.id.tvHint).setVisibility(View.GONE);
+        }
+
+        final RecyclerView list = view.findViewById(R.id.list);
+        adapter = new SubaddressInfoAdapter(getActivity(), this);
+        list.setAdapter(adapter);
+        adapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() {
+            @Override
+            public void onItemRangeInserted(int positionStart, int itemCount) {
+                list.scrollToPosition(positionStart);
+            }
+        });
+
+        Helper.hideKeyboard(getActivity());
+
+        wallet = WalletManager.getInstance().getWallet();
+
+        loadList();
+
+        return view;
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        postponeEnterTransition();
+        view.getViewTreeObserver().addOnPreDrawListener(() -> {
+            startPostponedEnterTransition();
+            return true;
+        });
+    }
+
+    public void loadList() {
+        Timber.d("loadList()");
+        final int numSubaddresses = wallet.getNumSubaddresses();
+        final List<Subaddress> list = new ArrayList<>();
+        for (int i = 0; i < numSubaddresses; i++) {
+            list.add(wallet.getSubaddressObject(i));
+        }
+        adapter.setInfos(list);
+    }
+
+    @Override
+    public void onBlockUpdate(Wallet wallet) {
+        loadList();
+    }
+
+    @Override
+    public void onClick(View v) {
+        int id = v.getId();
+        if (id == R.id.fab) {
+            getNewSubaddress();
+        }
+    }
+
+    private int lastUsedSubaddress() {
+        int lastUsedSubaddress = 0;
+        for (TransactionInfo info : wallet.getHistory().getAll()) {
+            if (info.addressIndex > lastUsedSubaddress)
+                lastUsedSubaddress = info.addressIndex;
+        }
+        return lastUsedSubaddress;
+    }
+
+    private void getNewSubaddress() {
+        final int maxSubaddresses = lastUsedSubaddress() + wallet.getDeviceType().getSubaddressLookahead();
+        if (wallet.getNumSubaddresses() < maxSubaddresses)
+            new AsyncSubaddress().executeOnExecutor(MoneroThreadPoolExecutor.MONERO_THREAD_POOL_EXECUTOR);
+        else
+            Toast.makeText(getActivity(), getString(R.string.max_subaddress_warning), Toast.LENGTH_LONG).show();
+    }
+
+    @SuppressLint("StaticFieldLeak")
+    @RequiredArgsConstructor
+    private class AsyncSubaddress extends AsyncTask<Void, Void, Boolean> {
+        boolean dialogOpened = false;
+
+        @Override
+        protected void onPreExecute() {
+            super.onPreExecute();
+            if ((wallet.getDeviceType() == Wallet.Device.Device_Ledger) && (progressCallback != null)) {
+                progressCallback.showLedgerProgressDialog(LedgerProgressDialog.TYPE_SUBADDRESS);
+                dialogOpened = true;
+            }
+        }
+
+        @Override
+        protected Boolean doInBackground(Void... params) {
+            if (params.length != 0) return false;
+            wallet.getNewSubaddress();
+            wallet.store();
+            return true;
+        }
+
+        @Override
+        protected void onPostExecute(Boolean result) {
+            super.onPostExecute(result);
+            if (dialogOpened)
+                progressCallback.dismissProgressDialog();
+            if (!isAdded()) // never mind then
+                return;
+            loadList();
+        }
+    }
+
+    boolean managerMode = false;
+
+    // Callbacks from SubaddressInfoAdapter
+    @Override
+    public void onInteraction(final View view, final Subaddress subaddress) {
+        if (managerMode)
+            activityCallback.showSubaddress(view, subaddress.getAddressIndex());
+        else
+            activityCallback.onSubaddressSelected(subaddress); // also closes the fragment with onBackpressed()
+    }
+
+    @Override
+    public boolean onLongInteraction(View view, Subaddress subaddress) {
+        activityCallback.showSubaddress(view, subaddress.getAddressIndex());
+        return false;
+    }
+}
--- a/app/src/main/java/com/m2049r/xmrwallet/SubaddressInfoFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/SubaddressInfoFragment.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (c) 2017 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.xmrwallet;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.inputmethod.EditorInfo;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.textfield.TextInputLayout;
+import com.google.android.material.transition.MaterialContainerTransform;
+import com.m2049r.xmrwallet.data.Subaddress;
+import com.m2049r.xmrwallet.layout.TransactionInfoAdapter;
+import com.m2049r.xmrwallet.model.TransactionInfo;
+import com.m2049r.xmrwallet.model.Wallet;
+import com.m2049r.xmrwallet.util.Helper;
+import com.m2049r.xmrwallet.util.ThemeHelper;
+import com.m2049r.xmrwallet.widget.Toolbar;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import timber.log.Timber;
+
+public class SubaddressInfoFragment extends Fragment
+        implements TransactionInfoAdapter.OnInteractionListener, OnBlockUpdateListener {
+    private TransactionInfoAdapter adapter;
+
+    private Subaddress subaddress;
+
+    private TextInputLayout etName;
+    private TextView tvAddress;
+    private TextView tvTxLabel;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_subaddressinfo, container, false);
+
+        etName = view.findViewById(R.id.etName);
+        tvAddress = view.findViewById(R.id.tvAddress);
+        tvTxLabel = view.findViewById(R.id.tvTxLabel);
+
+        final RecyclerView list = view.findViewById(R.id.list);
+        adapter = new TransactionInfoAdapter(getActivity(), this);
+        list.setAdapter(adapter);
+
+        final Wallet wallet = activityCallback.getWallet();
+
+        Bundle b = getArguments();
+        final int subaddressIndex = b.getInt("subaddressIndex");
+        subaddress = wallet.getSubaddressObject(subaddressIndex);
+
+        etName.getEditText().setText(subaddress.getDisplayLabel());
+        tvAddress.setText(getContext().getString(R.string.subbaddress_info_subtitle,
+                subaddress.getAddressIndex(), subaddress.getSquashedAddress()));
+
+        etName.getEditText().setOnFocusChangeListener((v, hasFocus) -> {
+            if (!hasFocus) {
+                wallet.setSubaddressLabel(subaddressIndex, etName.getEditText().getText().toString());
+            }
+        });
+        etName.getEditText().setOnEditorActionListener((v, actionId, event) -> {
+            if ((event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER) && (event.getAction() == KeyEvent.ACTION_DOWN))
+                    || (actionId == EditorInfo.IME_ACTION_DONE)) {
+                Helper.hideKeyboard(getActivity());
+                wallet.setSubaddressLabel(subaddressIndex, etName.getEditText().getText().toString());
+                onRefreshed(wallet);
+                return true;
+            }
+            return false;
+        });
+
+        onRefreshed(wallet);
+
+        return view;
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        final MaterialContainerTransform transform = new MaterialContainerTransform();
+        transform.setDrawingViewId(R.id.fragment_container);
+        transform.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
+        transform.setAllContainerColors(ThemeHelper.getThemedColor(getContext(), android.R.attr.colorBackground));
+        setSharedElementEnterTransition(transform);
+    }
+
+    public void onRefreshed(final Wallet wallet) {
+        Timber.d("onRefreshed");
+        List<TransactionInfo> list = new ArrayList<>();
+        for (TransactionInfo info : wallet.getHistory().getAll()) {
+            if (info.addressIndex == subaddress.getAddressIndex())
+                list.add(info);
+        }
+        adapter.setInfos(list);
+        if (list.isEmpty())
+            tvTxLabel.setText(R.string.subaddress_notx_label);
+        else
+            tvTxLabel.setText(R.string.subaddress_tx_label);
+    }
+
+    @Override
+    public void onBlockUpdate(Wallet wallet) {
+        onRefreshed(wallet);
+    }
+
+    // Callbacks from TransactionInfoAdapter
+    @Override
+    public void onInteraction(final View view, final TransactionInfo infoItem) {
+        activityCallback.onTxDetailsRequest(view, infoItem);
+    }
+
+    Listener activityCallback;
+
+    // Container Activity must implement this interface
+    public interface Listener {
+        void onTxDetailsRequest(View view, TransactionInfo info);
+
+        Wallet getWallet();
+
+        void setToolbarButton(int type);
+
+        void setTitle(String title, String subtitle);
+
+        void setSubtitle(String subtitle);
+    }
+
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+        if (context instanceof Listener) {
+            this.activityCallback = (Listener) context;
+        } else {
+            throw new ClassCastException(context.toString()
+                    + " must implement Listener");
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        Timber.d("onResume()");
+        activityCallback.setSubtitle(getString(R.string.subbaddress_title));
+        activityCallback.setToolbarButton(Toolbar.BUTTON_BACK);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+    }
+}
--- a/app/src/main/java/com/m2049r/xmrwallet/TxFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/TxFragment.java
@@ -22,7 +22,9 @@ import android.content.Intent;
 import android.graphics.Paint;
 import android.net.Uri;
 import android.os.Bundle;
+import android.text.Html;
 import android.text.InputType;
+import android.text.Spanned;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -37,12 +39,14 @@ import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;

 import com.google.android.material.transition.MaterialContainerTransform;
+import com.google.android.material.transition.MaterialElevationScale;
+import com.m2049r.xmrwallet.data.Subaddress;
 import com.m2049r.xmrwallet.data.UserNotes;
 import com.m2049r.xmrwallet.model.TransactionInfo;
 import com.m2049r.xmrwallet.model.Transfer;
 import com.m2049r.xmrwallet.model.Wallet;
-import com.m2049r.xmrwallet.util.ThemeHelper;
 import com.m2049r.xmrwallet.util.Helper;
+import com.m2049r.xmrwallet.util.ThemeHelper;
 import com.m2049r.xmrwallet.widget.Toolbar;

 import java.text.SimpleDateFormat;
@@ -52,6 +56,8 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.TimeZone;

+import timber.log.Timber;
+
 public class TxFragment extends Fragment {

    static public final String ARG_INFO = "info";
@@ -88,11 +94,16 @@ public class TxFragment extends Fragment {
    private ImageView tvXmrToLogo;

    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
        View view = inflater.inflate(R.layout.fragment_tx_info, container, false);

+        final MaterialElevationScale exitTransition = new MaterialElevationScale(false);
+        exitTransition.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
+        setExitTransition(exitTransition);
+        final MaterialElevationScale reenterTransition = new MaterialElevationScale(true);
+        reenterTransition.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
+        setReenterTransition(reenterTransition);
+
        cvXmrTo = view.findViewById(R.id.cvXmrTo);
        tvTxXmrToKey = view.findViewById(R.id.tvTxXmrToKey);
        tvDestinationBtc = view.findViewById(R.id.tvDestinationBtc);
@@ -121,9 +132,8 @@ public class TxFragment extends Fragment {
            Toast.makeText(getActivity(), getString(R.string.message_copy_xmrtokey), Toast.LENGTH_SHORT).show();
        });

-        Bundle args = getArguments();
-        TransactionInfo info = args.getParcelable(ARG_INFO);
-        show(info);
+        info = getArguments().getParcelable(ARG_INFO);
+        show();
        return view;
    }

@@ -192,7 +202,7 @@ public class TxFragment extends Fragment {
    TransactionInfo info = null;
    UserNotes userNotes = null;

-    void loadNotes(TransactionInfo info) {
+    void loadNotes() {
        if ((userNotes == null) || (info.notes == null)) {
            info.notes = activityCallback.getTxNotes(info.hash);
        }
@@ -205,19 +215,28 @@ public class TxFragment extends Fragment {
        tvTxFee.setTextColor(clr);
    }

-    private void show(TransactionInfo info) {
+    private void showSubaddressLabel() {
+        final Subaddress subaddress = activityCallback.getWalletSubaddress(info.accountIndex, info.addressIndex);
+        final Context ctx = getContext();
+        Spanned label = Html.fromHtml(ctx.getString(R.string.tx_account_formatted,
+                info.accountIndex, info.addressIndex,
+                Integer.toHexString(ContextCompat.getColor(ctx, R.color.monerujoGreen) & 0xFFFFFF),
+                Integer.toHexString(ContextCompat.getColor(ctx, R.color.monerujoBackground) & 0xFFFFFF),
+                subaddress.getDisplayLabel()));
+        tvAccount.setText(label);
+        tvAccount.setOnClickListener(v -> activityCallback.showSubaddress(v, info.addressIndex));
+    }
+
+    private void show() {
        if (info.txKey == null) {
            info.txKey = activityCallback.getTxKey(info.hash);
        }
        if (info.address == null) {
-            info.address = activityCallback.getTxAddress(info.account, info.subaddress);
+            info.address = activityCallback.getTxAddress(info.accountIndex, info.addressIndex);
        }
-        loadNotes(info);
+        loadNotes();

-        activityCallback.setSubtitle(getString(R.string.tx_title));
-        activityCallback.setToolbarButton(Toolbar.BUTTON_BACK);
-
-        tvAccount.setText(getString(R.string.tx_account_formatted, info.account, info.subaddress));
+        showSubaddressLabel();
        tvAddress.setText(info.address);

        tvTxTimestamp.setText(TS_FORMATTER.format(new Date(info.timestamp * 1000)));
@@ -256,8 +275,8 @@ public class TxFragment extends Fragment {
            setTxColour(ContextCompat.getColor(getContext(), R.color.tx_minus));
        }
        Set<String> destinations = new HashSet<>();
-        StringBuffer sb = new StringBuffer();
-        StringBuffer dstSb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
+        StringBuilder dstSb = new StringBuilder();
        if (info.transfers != null) {
            boolean newline = false;
            for (Transfer transfer : info.transfers) {
@@ -281,14 +300,12 @@ public class TxFragment extends Fragment {
            }
        } else {
            sb.append("-");
-            dstSb.append(info.direction ==
-                    TransactionInfo.Direction.Direction_In ?
-                    activityCallback.getWalletSubaddress(info.account, info.subaddress) :
+            dstSb.append(info.direction == TransactionInfo.Direction.Direction_In ?
+                    activityCallback.getWalletSubaddress(info.accountIndex, info.addressIndex).getAddress() :
                    "-");
        }
        tvTxTransfers.setText(sb.toString());
        tvDestination.setText(dstSb.toString());
-        this.info = info;
        showBtcInfo();
    }

@@ -334,7 +351,7 @@ public class TxFragment extends Fragment {
        final MaterialContainerTransform transform = new MaterialContainerTransform();
        transform.setDrawingViewId(R.id.fragment_container);
        transform.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
-        transform.setAllContainerColors(ThemeHelper.getThemedColor(getContext(), R.attr.colorSurface));
+        transform.setAllContainerColors(ThemeHelper.getThemedColor(getContext(), android.R.attr.colorBackground));
        setSharedElementEnterTransition(transform);
    }

@@ -347,7 +364,7 @@ public class TxFragment extends Fragment {
    Listener activityCallback;

    public interface Listener {
-        String getWalletSubaddress(int accountIndex, int subaddressIndex);
+        Subaddress getWalletSubaddress(int accountIndex, int subaddressIndex);

        String getTxKey(String hash);

@@ -361,6 +378,8 @@ public class TxFragment extends Fragment {

        void setSubtitle(String subtitle);

+        void showSubaddress(View view, final int subaddressIndex);
+
    }

    @Override
@@ -385,4 +404,13 @@ public class TxFragment extends Fragment {
        Helper.hideKeyboard(getActivity());
        super.onPause();
    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        Timber.d("onResume()");
+        activityCallback.setSubtitle(getString(R.string.tx_title));
+        activityCallback.setToolbarButton(Toolbar.BUTTON_BACK);
+        showSubaddressLabel();
+    }
 }
--- a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
--- a/app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java
@@ -58,7 +58,6 @@ import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Objects;

 import timber.log.Timber;

@@ -79,6 +78,7 @@ public class WalletFragment extends Fragment
    private Button bSend;
    private ImageView ivStreetGunther;
    private Drawable streetGunther = null;
+    RecyclerView txlist;

    private Spinner sCurrency;

@@ -106,13 +106,6 @@ public class WalletFragment extends Fragment
                             Bundle savedInstanceState) {
        View view = inflater.inflate(R.layout.fragment_wallet, container, false);

-        final MaterialElevationScale exitTransition = new MaterialElevationScale(false);
-        exitTransition.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
-        setExitTransition(exitTransition);
-        final MaterialElevationScale reenterTransition = new MaterialElevationScale(true);
-        reenterTransition.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
-        setReenterTransition(reenterTransition);
-
        ivStreetGunther = view.findViewById(R.id.ivStreetGunther);
        tvStreetView = view.findViewById(R.id.tvStreetView);
        llBalance = view.findViewById(R.id.llBalance);
@@ -132,21 +125,28 @@ public class WalletFragment extends Fragment
        sCurrency = view.findViewById(R.id.sCurrency);
        List<String> currencies = new ArrayList<>();
        currencies.add(Helper.BASE_CRYPTO);
-        currencies.addAll(Arrays.asList(getResources().getStringArray(R.array.currency)));
-        ArrayAdapter<String> spinnerAdapter = new ArrayAdapter<>(Objects.requireNonNull(getContext()), R.layout.item_spinner_balance, currencies);
+        if (Helper.SHOW_EXCHANGERATES)
+            currencies.addAll(Arrays.asList(getResources().getStringArray(R.array.currency)));
+        ArrayAdapter<String> spinnerAdapter = new ArrayAdapter<>(requireContext(), R.layout.item_spinner_balance, currencies);
        spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
        sCurrency.setAdapter(spinnerAdapter);

        bSend = view.findViewById(R.id.bSend);
        bReceive = view.findViewById(R.id.bReceive);

-        RecyclerView recyclerView = view.findViewById(R.id.list);
-
+        txlist = view.findViewById(R.id.list);
        adapter = new TransactionInfoAdapter(getActivity(), this);
-        recyclerView.setAdapter(adapter);
+        txlist.setAdapter(adapter);
+        adapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() {
+            @Override
+            public void onItemRangeInserted(int positionStart, int itemCount) {
+                if ((positionStart == 0) && (txlist.computeVerticalScrollOffset() == 0))
+                    txlist.scrollToPosition(positionStart);
+            }
+        });

-        SwipeableRecyclerViewTouchListener swipeTouchListener =
-                new SwipeableRecyclerViewTouchListener(recyclerView,
+        txlist.addOnItemTouchListener(
+                new SwipeableRecyclerViewTouchListener(txlist,
                        new SwipeableRecyclerViewTouchListener.SwipeListener() {
                            @Override
                            public boolean canSwipeLeft(int position) {
@@ -173,10 +173,7 @@ public class WalletFragment extends Fragment
                                    adapter.removeItem(position);
                                }
                            }
-                        });
-
-        recyclerView.addOnItemTouchListener(swipeTouchListener);
-
+                        }));

        bSend.setOnClickListener(v -> activityCallback.onSendRequest(v));
        bReceive.setOnClickListener(v -> activityCallback.onWalletReceive(v));
@@ -338,24 +335,39 @@ public class WalletFragment extends Fragment
        final MaterialElevationScale reenterTransition = new MaterialElevationScale(true);
        reenterTransition.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
        setReenterTransition(reenterTransition);
+
        activityCallback.onTxDetailsRequest(view, infoItem);
    }

    // called from activity

-    public void onRefreshed(final Wallet wallet, final boolean full) {
+
+    // if account index has changed scroll to top?
+    private int accountIndex = 0;
+
+    public void onRefreshed(final Wallet wallet, boolean full) {
        Timber.d("onRefreshed(%b)", full);
+
+        if (adapter.needsTransactionUpdateOnNewBlock()) {
+            wallet.refreshHistory();
+            full = true;
+        }
        if (full) {
            List<TransactionInfo> list = new ArrayList<>();
            final long streetHeight = activityCallback.getStreetModeHeight();
            Timber.d("StreetHeight=%d", streetHeight);
+            wallet.refreshHistory();
            for (TransactionInfo info : wallet.getHistory().getAll()) {
-                Timber.d("TxHeight=%d", info.blockheight);
+                Timber.d("TxHeight=%d, Label=%s", info.blockheight, info.subaddressLabel);
                if ((info.isPending || (info.blockheight >= streetHeight))
                        && !dismissedTransactions.contains(info.hash))
                    list.add(info);
            }
            adapter.setInfos(list);
+            if (accountIndex != wallet.getAccountIndex()) {
+                accountIndex = wallet.getAccountIndex();
+                txlist.scrollToPosition(0);
+            }
        }
        updateStatus(wallet);
    }
@@ -522,9 +534,10 @@ public class WalletFragment extends Fragment
    @Override
    public void onResume() {
        super.onResume();
+        setExitTransition(null);
+        setReenterTransition(null);
        Timber.d("onResume()");
        activityCallback.setTitle(walletTitle, walletSubtitle);
-        //activityCallback.setToolbarButton(Toolbar.BUTTON_CLOSE); // TODO: Close button somewhere else
        activityCallback.setToolbarButton(Toolbar.BUTTON_NONE);
        setProgress(syncProgress);
        setProgress(syncText);
@@ -552,7 +565,7 @@ public class WalletFragment extends Fragment
        //TODO figure out why gunther disappears on return from send although he is still set
        if (enable) {
            if (streetGunther == null)
-                streetGunther = ContextCompat.getDrawable(Objects.requireNonNull(getContext()), R.drawable.ic_gunther_streetmode);
+                streetGunther = ContextCompat.getDrawable(requireContext(), R.drawable.ic_gunther_streetmode);
            ivStreetGunther.setImageDrawable(streetGunther);
        } else
            ivStreetGunther.setImageDrawable(null);
--- a/app/src/main/java/com/m2049r/xmrwallet/data/Subaddress.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/data/Subaddress.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2018 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.xmrwallet.data;
+
+import java.util.regex.Pattern;
+
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@RequiredArgsConstructor
+@ToString
+@EqualsAndHashCode
+public class Subaddress implements Comparable<Subaddress> {
+    @Getter
+    final private int accountIndex;
+    @Getter
+    final private int addressIndex;
+    @Getter
+    final private String address;
+    @Getter
+    private final String label;
+    @Getter
+    @Setter
+    private long amount;
+
+    @Override
+    public int compareTo(Subaddress another) { // newer is <
+        final int compareAccountIndex = another.accountIndex - accountIndex;
+        if (compareAccountIndex == 0)
+            return another.addressIndex - addressIndex;
+        return compareAccountIndex;
+    }
+
+    public String getSquashedAddress() {
+        return address.substring(0, 8) + "…" + address.substring(address.length() - 8);
+    }
+
+    public static final Pattern DEFAULT_LABEL_FORMATTER = Pattern.compile("^[0-9]{4}-[0-9]{2}-[0-9]{2}-[0-9]{2}:[0-9]{2}:[0-9]{2}$");
+
+    public String getDisplayLabel() {
+        if (label.isEmpty() || (DEFAULT_LABEL_FORMATTER.matcher(label).matches()))
+            return ("#" + addressIndex);
+        else
+            return label;
+    }
+}
--- a/app/src/main/java/com/m2049r/xmrwallet/data/TxData.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/data/TxData.java
@@ -21,6 +21,7 @@ import android.os.Parcelable;

 import com.m2049r.xmrwallet.model.PendingTransaction;
 import com.m2049r.xmrwallet.model.Wallet;
+import com.m2049r.xmrwallet.util.Helper;

 // https://stackoverflow.com/questions/2139134/how-to-send-an-object-from-one-android-activity-to-another-using-intents
 public class TxData implements Parcelable {
@@ -54,7 +55,7 @@ public class TxData implements Parcelable {
    }

    public double getAmountAsDouble() {
-        return 1.0 * amount / 1000000000000L;
+        return 1.0 * amount / Helper.ONE_XMR;
    }

    public int getMixin() {
--- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAddressWizardFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAddressWizardFragment.java
@@ -117,32 +117,34 @@ public class SendAddressWizardFragment extends SendWizardFragment {

        View view = inflater.inflate(R.layout.fragment_send_address, container, false);

-        tvXmrTo = view.findViewById(R.id.tvXmrTo);
-
-        ibCrypto = new HashMap<>();
-        for (Crypto crypto : Crypto.values()) {
-            final ImageButton button = view.findViewById(crypto.getButtonId());
-            ibCrypto.put(crypto, button);
-            button.setOnClickListener(v -> {
-                if (possibleCryptos.contains(crypto)) {
-                    selectedCrypto = crypto;
-                    updateCryptoButtons(false);
-                } else {
-                    // show help what to do:
-                    if (button.getId() != R.id.ibXMR) {
-                        final String name = getResources().getStringArray(R.array.cryptos)[crypto.ordinal()];
-                        final String symbol = getCryptoForButton(button).getSymbol();
-                        tvXmrTo.setText(Html.fromHtml(getString(R.string.info_xmrto_help, name, symbol)));
-                        tvXmrTo.setVisibility(View.VISIBLE);
+        if (Helper.ALLOW_SHIFT) {
+            tvXmrTo = view.findViewById(R.id.tvXmrTo);
+            ibCrypto = new HashMap<>();
+            for (Crypto crypto : Crypto.values()) {
+                final ImageButton button = view.findViewById(crypto.getButtonId());
+                ibCrypto.put(crypto, button);
+                button.setOnClickListener(v -> {
+                    if (possibleCryptos.contains(crypto)) {
+                        selectedCrypto = crypto;
+                        updateCryptoButtons(false);
                    } else {
-                        tvXmrTo.setText(Html.fromHtml(getString(R.string.info_xmrto_help_xmr)));
-                        tvXmrTo.setVisibility(View.VISIBLE);
+                        // show help what to do:
+                        if (button.getId() != R.id.ibXMR) {
+                            final String name = getResources().getStringArray(R.array.cryptos)[crypto.ordinal()];
+                            final String symbol = getCryptoForButton(button).getSymbol();
+                            tvXmrTo.setText(Html.fromHtml(getString(R.string.info_xmrto_help, name, symbol)));
+                            tvXmrTo.setVisibility(View.VISIBLE);
+                        } else {
+                            tvXmrTo.setText(Html.fromHtml(getString(R.string.info_xmrto_help_xmr)));
+                            tvXmrTo.setVisibility(View.VISIBLE);
+                        }
                    }
-                }
-            });
+                });
+            }
+            updateCryptoButtons(true);
+        } else {
+            view.findViewById(R.id.llExchange).setVisibility(View.GONE);
        }
-        updateCryptoButtons(true);
-
        etAddress = view.findViewById(R.id.etAddress);
        etAddress.getEditText().setRawInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
        etAddress.getEditText().setOnEditorActionListener(new TextView.OnEditorActionListener() {
@@ -181,6 +183,7 @@ public class SendAddressWizardFragment extends SendWizardFragment {
                    selectedCrypto = Crypto.XMR;
                    sendListener.setMode(SendFragment.Mode.XMR);
                }
+                if (!Helper.ALLOW_SHIFT) return;
                if ((selectedCrypto == null) && isEthAddress(address)) {
                    Timber.d("isEthAddress");
                    possibleCryptos.add(Crypto.ETH);
@@ -285,6 +288,7 @@ public class SendAddressWizardFragment extends SendWizardFragment {
    }

    private void updateCryptoButtons(boolean noAddress) {
+        if (!Helper.ALLOW_SHIFT) return;
        for (Crypto crypto : Crypto.values()) {
            if (crypto == selectedCrypto) {
                selectedCrypto(crypto);
@@ -345,7 +349,7 @@ public class SendAddressWizardFragment extends SendWizardFragment {

    private boolean checkAddress() {
        boolean ok = checkAddressNoError();
-        if (!ok) {
+        if (possibleCryptos.isEmpty()) {
            etAddress.setError(getString(R.string.send_address_invalid));
        } else {
            etAddress.setError(null);
@@ -447,7 +451,11 @@ public class SendAddressWizardFragment extends SendWizardFragment {
        BarcodeData barcodeData = sendListener.getBarcodeData();
        if (barcodeData != null) {
            Timber.d("GOT DATA");
-
+            if (!Helper.ALLOW_SHIFT && (barcodeData.asset != Crypto.XMR)) {
+                Timber.d("BUT ONLY XMR SUPPORTED");
+                barcodeData = null;
+                sendListener.setBarcodeData(barcodeData);
+            }
            if (barcodeData.address != null) {
                etAddress.getEditText().setText(barcodeData.address);
                possibleCryptos.clear();
@@ -458,7 +466,8 @@ public class SendAddressWizardFragment extends SendWizardFragment {
                    possibleCryptos.add(barcodeData.asset);
                    selectedCrypto = barcodeData.asset;
                }
-                updateCryptoButtons(false);
+                if (Helper.ALLOW_SHIFT)
+                    updateCryptoButtons(false);
                if (checkAddress()) {
                    if (barcodeData.security == BarcodeData.Security.OA_NO_DNSSEC)
                        etAddress.setError(getString(R.string.send_address_no_dnssec));
--- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAmountWizardFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAmountWizardFragment.java
@@ -139,7 +139,7 @@ public class SendAmountWizardFragment extends SendWizardFragment {
        Timber.d("onResumeFragment()");
        Helper.showKeyboard(getActivity());
        final long funds = getTotalFunds();
-        maxFunds = 1.0 * funds / 1000000000000L;
+        maxFunds = 1.0 * funds / Helper.ONE_XMR;
        if (!sendListener.getActivityCallback().isStreetMode()) {
            tvFunds.setText(getString(R.string.send_available,
                    Wallet.getDisplayAmount(funds)));
--- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcAmountWizardFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcAmountWizardFragment.java
@@ -34,6 +34,7 @@ import com.m2049r.xmrwallet.service.shift.ShiftException;
 import com.m2049r.xmrwallet.service.shift.sideshift.api.QueryOrderParameters;
 import com.m2049r.xmrwallet.service.shift.sideshift.api.SideShiftApi;
 import com.m2049r.xmrwallet.service.shift.sideshift.network.SideShiftApiImpl;
+import com.m2049r.xmrwallet.util.Helper;
 import com.m2049r.xmrwallet.util.OkHttpHelper;
 import com.m2049r.xmrwallet.util.ServiceHelper;
 import com.m2049r.xmrwallet.widget.ExchangeOtherEditText;
@@ -89,7 +90,6 @@ public class SendBtcAmountWizardFragment extends SendWizardFragment {
        return view;
    }

-
    @Override
    public boolean onValidateFields() {
        Timber.i(maxBtc + "/" + minBtc);
@@ -179,7 +179,7 @@ public class SendBtcAmountWizardFragment extends SendWizardFragment {
            tvXmrToParms.setText(xmrParmText);

            final long funds = getTotalFunds();
-            double availableXmr = 1.0 * funds / 1000000000000L;
+            double availableXmr = 1.0 * funds / Helper.ONE_XMR;

            String availBtcString;
            String availXmrString;
--- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcConfirmWizardFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcConfirmWizardFragment.java
@@ -359,40 +359,22 @@ public class SendBtcConfirmWizardFragment extends SendWizardFragment implements
    }

    private RequestQuote xmrtoQuote = null;
-    private int stageARetries = 0;
-    private final int RETRIES = 3;
-    private double stageAPrice = 0;

    private void processStageA(final RequestQuote requestQuote) {
        Timber.d("processCreateOrder %s", requestQuote.getId());
        TxDataBtc txDataBtc = (TxDataBtc) sendListener.getTxData();
-        // verify the BTC amount is correct (price can change and we can only specify XMR amount)
+        // verify the BTC amount is correct
        if (requestQuote.getBtcAmount() != txDataBtc.getBtcAmount()) {
-            if (--stageARetries <= 0) {
-                Timber.d("Failed to get quote");
-                getView().post(() ->
-                        showStageError(ShiftError.Error.SERVICE.toString(),
-                                getString(R.string.shift_noquote),
-                                getString(R.string.shift_checkamount)));
-                return; // just stop for now
-            }
-            if (stageAPrice == requestQuote.getPrice()) {
-                // same price but different BTC amount - something else is wrong (e.g. too many decimals)
-                Timber.d("Price unchanged");
-                getView().post(() ->
-                        showStageError(ShiftError.Error.SERVICE.toString(),
-                                getString(R.string.shift_noquote),
-                                getString(R.string.shift_checkamount)));
-                return; // just stop for now
-            }
-            stageAPrice = requestQuote.getPrice();
-            // recalc XMR and try again
-            txDataBtc.setAmount(txDataBtc.getBtcAmount() / requestQuote.getPrice());
-            getView().post(this::stageAOneShot);
-            return; // stageA will run in the main thread
+            Timber.d("Failed to get quote");
+            getView().post(() -> showStageError(ShiftError.Error.SERVICE.toString(),
+                    getString(R.string.shift_noquote),
+                    getString(R.string.shift_checkamount)));
+            return; // just stop for now
        }
        xmrtoQuote = requestQuote;
+        txDataBtc.setAmount(xmrtoQuote.getXmrAmount());
        getView().post(() -> {
+            // show data from the actual quote as that is what is used to
            NumberFormat df = NumberFormat.getInstance(Locale.US);
            df.setMaximumFractionDigits(12);
            final String btcAmount = df.format(xmrtoQuote.getBtcAmount());
@@ -438,18 +420,12 @@ public class SendBtcConfirmWizardFragment extends SendWizardFragment implements
    }

    private void stageA() {
-        stageARetries = RETRIES;
-        stageAOneShot();
-    }
-
-    private void stageAOneShot() {
        if (!isResumed) return;
        Timber.d("Request Quote");
        xmrtoQuote = null;
        xmrtoOrder = null;
        showProgress(1, getString(R.string.label_send_progress_xmrto_create));
        TxDataBtc txDataBtc = (TxDataBtc) sendListener.getTxData();
-        stageAPrice = 0;

        ShiftCallback<RequestQuote> callback = new ShiftCallback<RequestQuote>() {
            @Override
@@ -473,7 +449,7 @@ public class SendBtcConfirmWizardFragment extends SendWizardFragment implements
            }
        };

-        getXmrToApi().requestQuote(txDataBtc.getAmountAsDouble(), callback);
+        getXmrToApi().requestQuote(txDataBtc.getBtcAmount(), callback);
    }

    private CreateOrder xmrtoOrder = null;
--- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendFragment.java
@@ -66,7 +66,7 @@ public class SendFragment extends Fragment
        SendSuccessWizardFragment.Listener,
        OnBackPressedListener, OnUriScannedListener {

-    final static public int MIXIN = 10;
+    final static public int MIXIN = 0;

    private Listener activityCallback;

@@ -547,7 +547,7 @@ public class SendFragment extends Fragment
        final MaterialContainerTransform transform = new MaterialContainerTransform();
        transform.setDrawingViewId(R.id.fragment_container);
        transform.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
-        transform.setAllContainerColors(ThemeHelper.getThemedColor(Objects.requireNonNull(getContext()), R.attr.colorSurface));
+        transform.setAllContainerColors(ThemeHelper.getThemedColor(getContext(), android.R.attr.colorBackground));
        setSharedElementEnterTransition(transform);
    }

--- a/app/src/main/java/com/m2049r/xmrwallet/layout/NodeInfoAdapter.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/layout/NodeInfoAdapter.java
@@ -48,7 +48,7 @@ public class NodeInfoAdapter extends RecyclerView.Adapter<NodeInfoAdapter.ViewHo
    public interface OnInteractionListener {
        void onInteraction(View view, NodeInfo item);

-        void onLongInteraction(View view, NodeInfo item);
+        boolean onLongInteraction(View view, NodeInfo item);
    }

    private final List<NodeInfo> nodeItems = new ArrayList<>();
@@ -213,10 +213,10 @@ public class NodeInfoAdapter extends RecyclerView.Adapter<NodeInfoAdapter.ViewHo
            if (listener != null) {
                int position = getAdapterPosition(); // gets item position
                if (position != RecyclerView.NO_POSITION) { // Check if an item was deleted, but the user clicked it before the UI removed it
-                    listener.onLongInteraction(view, nodeItems.get(position));
+                    return listener.onLongInteraction(view, nodeItems.get(position));
                }
            }
-            return true;
+            return false;
        }
    }

--- a/app/src/main/java/com/m2049r/xmrwallet/layout/SubaddressInfoAdapter.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/layout/SubaddressInfoAdapter.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 2017 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.xmrwallet.layout;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.DiffUtil;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.m2049r.xmrwallet.R;
+import com.m2049r.xmrwallet.data.Subaddress;
+import com.m2049r.xmrwallet.util.Helper;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import timber.log.Timber;
+
+public class SubaddressInfoAdapter extends RecyclerView.Adapter<SubaddressInfoAdapter.ViewHolder> {
+    public interface OnInteractionListener {
+        void onInteraction(View view, Subaddress item);
+
+        boolean onLongInteraction(View view, Subaddress item);
+    }
+
+    private final List<Subaddress> items;
+    private final OnInteractionListener listener;
+
+    Context context;
+
+    public SubaddressInfoAdapter(Context context, OnInteractionListener listener) {
+        this.context = context;
+        this.items = new ArrayList<>();
+        this.listener = listener;
+    }
+
+    private static class SubaddressInfoDiff extends DiffCallback<Subaddress> {
+
+        public SubaddressInfoDiff(List<Subaddress> oldList, List<Subaddress> newList) {
+            super(oldList, newList);
+        }
+
+        @Override
+        public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
+            return mOldList.get(oldItemPosition).getAddress().equals(mNewList.get(newItemPosition).getAddress());
+        }
+
+        @Override
+        public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
+            return mOldList.get(oldItemPosition).equals(mNewList.get(newItemPosition));
+        }
+    }
+
+    @NonNull
+    @Override
+    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.item_subaddress, parent, false);
+        return new ViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(final ViewHolder holder, int position) {
+        holder.bind(position);
+    }
+
+    @Override
+    public int getItemCount() {
+        return items.size();
+    }
+
+    public Subaddress getItem(int position) {
+        return items.get(position);
+    }
+
+    public void setInfos(List<Subaddress> newItems) {
+        if (newItems == null) {
+            newItems = new ArrayList<>();
+            Timber.d("setInfos null");
+        } else {
+            Timber.d("setInfos %s", newItems.size());
+        }
+        Collections.sort(newItems);
+        final DiffCallback<Subaddress> diffCallback = new SubaddressInfoDiff(items, newItems);
+        final DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(diffCallback);
+        items.clear();
+        items.addAll(newItems);
+        diffResult.dispatchUpdatesTo(this);
+    }
+
+    class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
+        final TextView tvName;
+        final TextView tvAddress;
+        final TextView tvAmount;
+        Subaddress item;
+
+        ViewHolder(View itemView) {
+            super(itemView);
+            tvName = itemView.findViewById(R.id.tvName);
+            tvAddress = itemView.findViewById(R.id.tvAddress);
+            tvAmount = itemView.findViewById(R.id.tx_amount);
+            itemView.setOnClickListener(this);
+            itemView.setOnLongClickListener(this);
+        }
+
+        void bind(int position) {
+            item = getItem(position);
+            itemView.setTransitionName(context.getString(R.string.subaddress_item_transition_name, item.getAddressIndex()));
+
+            final String label = item.getDisplayLabel();
+            final String address = context.getString(R.string.subbaddress_info_subtitle,
+                    item.getAddressIndex(), item.getSquashedAddress());
+            tvName.setText(label.isEmpty() ? address : label);
+            tvAddress.setText(address);
+            final long amount = item.getAmount();
+            if (amount > 0)
+                tvAmount.setText(context.getString(R.string.tx_list_amount_positive,
+                        Helper.getDisplayAmount(amount, Helper.DISPLAY_DIGITS_INFO)));
+            else
+                tvAmount.setText("");
+        }
+
+        @Override
+        public void onClick(View view) {
+            if (listener != null) {
+                int position = getAdapterPosition(); // gets item position
+                if (position != RecyclerView.NO_POSITION) { // Check if an item was deleted, but the user clicked it before the UI removed it
+                    listener.onInteraction(view, getItem(position));
+                }
+            }
+        }
+
+        @Override
+        public boolean onLongClick(View view) {
+            if (listener != null) {
+                int position = getAdapterPosition(); // gets item position
+                if (position != RecyclerView.NO_POSITION) { // Check if an item was deleted, but the user clicked it before the UI removed it
+                    return listener.onLongInteraction(view, getItem(position));
+                }
+            }
+            return true;
+        }
+    }
+}
--- a/app/src/main/java/com/m2049r/xmrwallet/layout/TransactionInfoAdapter.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/layout/TransactionInfoAdapter.java
@@ -17,6 +17,8 @@
 package com.m2049r.xmrwallet.layout;

 import android.content.Context;
+import android.text.Html;
+import android.text.Spanned;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -28,6 +30,7 @@ import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.RecyclerView;

+import com.google.android.material.progressindicator.CircularProgressIndicator;
 import com.m2049r.xmrwallet.R;
 import com.m2049r.xmrwallet.data.Crypto;
 import com.m2049r.xmrwallet.data.UserNotes;
@@ -46,8 +49,7 @@ import java.util.TimeZone;
 import timber.log.Timber;

 public class TransactionInfoAdapter extends RecyclerView.Adapter<TransactionInfoAdapter.ViewHolder> {
-
-    private final SimpleDateFormat DATETIME_FORMATTER = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+    private final static SimpleDateFormat DATETIME_FORMATTER = new SimpleDateFormat("yyyy-MM-dd HH:mm");

    private final int outboundColour;
    private final int inboundColour;
@@ -76,6 +78,10 @@ public class TransactionInfoAdapter extends RecyclerView.Adapter<TransactionInfo
        DATETIME_FORMATTER.setTimeZone(tz);
    }

+    public boolean needsTransactionUpdateOnNewBlock() {
+        return (infoItems.size() > 0) && !infoItems.get(0).isConfirmed();
+    }
+
    private static class TransactionInfoDiff extends DiffCallback<TransactionInfo> {

        public TransactionInfoDiff(List<TransactionInfo> oldList, List<TransactionInfo> newList) {
@@ -94,6 +100,8 @@ public class TransactionInfoAdapter extends RecyclerView.Adapter<TransactionInfo
            return (oldItem.direction == newItem.direction)
                    && (oldItem.isPending == newItem.isPending)
                    && (oldItem.isFailed == newItem.isFailed)
+                    && ((oldItem.confirmations == newItem.confirmations) || (oldItem.isConfirmed()))
+                    && (oldItem.subaddressLabel.equals(newItem.subaddressLabel))
                    && (Objects.equals(oldItem.notes, newItem.notes));
        }
    }
@@ -147,6 +155,8 @@ public class TransactionInfoAdapter extends RecyclerView.Adapter<TransactionInfo
        final TextView tvFee;
        final TextView tvPaymentId;
        final TextView tvDateTime;
+        final CircularProgressIndicator pbConfirmations;
+        final TextView tvConfirmations;
        TransactionInfo infoItem;

        ViewHolder(View itemView) {
@@ -156,6 +166,9 @@ public class TransactionInfoAdapter extends RecyclerView.Adapter<TransactionInfo
            tvFee = itemView.findViewById(R.id.tx_fee);
            tvPaymentId = itemView.findViewById(R.id.tx_paymentid);
            tvDateTime = itemView.findViewById(R.id.tx_datetime);
+            pbConfirmations = itemView.findViewById(R.id.pbConfirmations);
+            pbConfirmations.setMax(TransactionInfo.CONFIRMATION);
+            tvConfirmations = itemView.findViewById(R.id.tvConfirmations);
        }

        private String getDateTime(long time) {
@@ -180,7 +193,7 @@ public class TransactionInfoAdapter extends RecyclerView.Adapter<TransactionInfo
                    ivTxType.setVisibility(View.GONE);
                }
            } else {
-                ivTxType.setVisibility(View.GONE); // gives us more space for the amount
+                ivTxType.setVisibility(View.GONE);
            }

            String displayAmount = Helper.getDisplayAmount(infoItem.amount, Helper.DISPLAY_DIGITS_INFO);
@@ -203,22 +216,55 @@ public class TransactionInfoAdapter extends RecyclerView.Adapter<TransactionInfo
                this.tvFee.setText(context.getString(R.string.tx_list_failed_text));
                tvFee.setVisibility(View.VISIBLE);
                setTxColour(failedColour);
+                pbConfirmations.setVisibility(View.GONE);
+                tvConfirmations.setVisibility(View.GONE);
            } else if (infoItem.isPending) {
                setTxColour(pendingColour);
+                pbConfirmations.setVisibility(View.GONE);
+                pbConfirmations.setIndeterminate(true);
+                pbConfirmations.setVisibility(View.VISIBLE);
+                tvConfirmations.setVisibility(View.GONE);
            } else if (infoItem.direction == TransactionInfo.Direction.Direction_In) {
                setTxColour(inboundColour);
+                if (!infoItem.isConfirmed()) {
+                    pbConfirmations.setVisibility(View.VISIBLE);
+                    final int confirmations = (int) infoItem.confirmations;
+                    pbConfirmations.setProgressCompat(confirmations, true);
+                    final String confCount = Integer.toString(confirmations);
+                    tvConfirmations.setText(confCount);
+                    if (confCount.length() == 1) // we only have space for character in the progress circle
+                        tvConfirmations.setVisibility(View.VISIBLE);
+                    else
+                        tvConfirmations.setVisibility(View.GONE);
+                } else {
+                    pbConfirmations.setVisibility(View.GONE);
+                    tvConfirmations.setVisibility(View.GONE);
+                }
            } else {
                setTxColour(outboundColour);
+                pbConfirmations.setVisibility(View.GONE);
+                tvConfirmations.setVisibility(View.GONE);
            }

+            String tag = null;
+            String info = "";
+            if ((infoItem.addressIndex != 0) && (infoItem.direction == TransactionInfo.Direction.Direction_In))
+                tag = infoItem.getDisplayLabel();
            if ((userNotes.note.isEmpty())) {
-                this.tvPaymentId.setText(infoItem.paymentId.equals("0000000000000000") ?
-                        (infoItem.subaddress != 0 ?
-                                (context.getString(R.string.tx_subaddress, infoItem.subaddress)) :
-                                "") :
-                        infoItem.paymentId);
+                if (!infoItem.paymentId.equals("0000000000000000")) {
+                    info = infoItem.paymentId;
+                }
            } else {
-                this.tvPaymentId.setText(userNotes.note);
+                info = userNotes.note;
+            }
+            if (tag == null) {
+                tvPaymentId.setText(info);
+            } else {
+                Spanned label = Html.fromHtml(context.getString(R.string.tx_details_notes,
+                        Integer.toHexString(ContextCompat.getColor(context, R.color.monerujoGreen) & 0xFFFFFF),
+                        Integer.toHexString(ContextCompat.getColor(context, R.color.monerujoBackground) & 0xFFFFFF),
+                        tag, info.isEmpty() ? "" : ("&nbsp; " + info)));
+                tvPaymentId.setText(label);
            }

            this.tvDateTime.setText(getDateTime(infoItem.timestamp));
--- a/app/src/main/java/com/m2049r/xmrwallet/layout/WalletInfoAdapter.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/layout/WalletInfoAdapter.java
@@ -74,7 +74,7 @@ public class WalletInfoAdapter extends RecyclerView.Adapter<WalletInfoAdapter.Vi

        @Override
        public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
-            return mOldList.get(oldItemPosition).name.equals(mNewList.get(newItemPosition).name);
+            return mOldList.get(oldItemPosition).getName().equals(mNewList.get(newItemPosition).getName());
        }

        @Override
@@ -86,9 +86,9 @@ public class WalletInfoAdapter extends RecyclerView.Adapter<WalletInfoAdapter.Vi
    @NonNull
    @Override
    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext())
-                .inflate(R.layout.item_wallet, parent, false);
-        return new ViewHolder(view);
+        return new ViewHolder(
+                LayoutInflater.from(parent.getContext()).inflate(R.layout.item_wallet, parent, false)
+        );
    }

    @Override
@@ -122,7 +122,6 @@ public class WalletInfoAdapter extends RecyclerView.Adapter<WalletInfoAdapter.Vi

    class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
        final TextView tvName;
-        final TextView tvAddress;
        final ImageButton ibOptions;
        WalletManager.WalletInfo infoItem;
        boolean popupOpen = false;
@@ -130,7 +129,6 @@ public class WalletInfoAdapter extends RecyclerView.Adapter<WalletInfoAdapter.Vi
        ViewHolder(View itemView) {
            super(itemView);
            tvName = itemView.findViewById(R.id.tvName);
-            tvAddress = itemView.findViewById(R.id.tvAddress);
            ibOptions = itemView.findViewById(R.id.ibOptions);
            ibOptions.setOnClickListener(view -> {
                if (popupOpen) return;
@@ -160,8 +158,7 @@ public class WalletInfoAdapter extends RecyclerView.Adapter<WalletInfoAdapter.Vi

        void bind(int position) {
            infoItem = infoItems.get(position);
-            tvName.setText(infoItem.name);
-            tvAddress.setText(infoItem.address.substring(0, 16) + "...");
+            tvName.setText(infoItem.getName());
        }

        @Override
--- a/app/src/main/java/com/m2049r/xmrwallet/model/TransactionHistory.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/model/TransactionHistory.java
@@ -43,7 +43,7 @@ public class TransactionHistory {
        this.accountIndex = accountIndex;
    }

-    public void loadNotes(Wallet wallet) {
+    private void loadNotes(Wallet wallet) {
        for (TransactionInfo info : transactions) {
            info.notes = wallet.getUserNote(info.hash);
        }
@@ -61,30 +61,22 @@ public class TransactionHistory {

    private List<TransactionInfo> transactions = new ArrayList<>();

-    public void refreshWithNotes(Wallet wallet) {
+    void refreshWithNotes(Wallet wallet) {
        refresh();
        loadNotes(wallet);
    }

-//    public void refresh() {
-//        transactions = refreshJ();
-//    }
-
-    public void refresh() {
-        List<TransactionInfo> t = refreshJ();
-        Timber.d("refreshed %d", t.size());
-        for (Iterator<TransactionInfo> iterator = t.iterator(); iterator.hasNext(); ) {
+    private void refresh() {
+        List<TransactionInfo> transactionInfos = refreshJ();
+        Timber.d("refresh size=%d", transactionInfos.size());
+        for (Iterator<TransactionInfo> iterator = transactionInfos.iterator(); iterator.hasNext(); ) {
            TransactionInfo info = iterator.next();
-            if (info.account != accountIndex) {
+            if (info.accountIndex != accountIndex) {
                iterator.remove();
-                Timber.d("removed %s", info.hash);
-            } else {
-                Timber.d("kept %s", info.hash);
            }
        }
-        transactions = t;
+        transactions = transactionInfos;
    }

    private native List<TransactionInfo> refreshJ();
-
 }
--- a/app/src/main/java/com/m2049r/xmrwallet/model/TransactionInfo.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/model/TransactionInfo.java
@@ -19,13 +19,19 @@ package com.m2049r.xmrwallet.model;
 import android.os.Parcel;
 import android.os.Parcelable;

+import com.m2049r.xmrwallet.data.Subaddress;
+
 import java.util.List;

+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
 // this is not the TransactionInfo from the API as that is owned by the TransactionHistory
 // this is a POJO for the TransactionInfoAdapter
 public class TransactionInfo implements Parcelable, Comparable<TransactionInfo> {
-    static final String TAG = "TransactionInfo";
+    public static final int CONFIRMATION = 10; // blocks

+    @RequiredArgsConstructor
    public enum Direction {
        Direction_In(0),
        Direction_Out(1);
@@ -40,15 +46,8 @@ public class TransactionInfo implements Parcelable, Comparable<TransactionInfo>
            return null;
        }

-        public int getValue() {
-            return value;
-        }
-
-        private int value;
-
-        Direction(int value) {
-            this.value = value;
-        }
+        @Getter
+        private final int value;
    }

    public Direction direction;
@@ -60,8 +59,8 @@ public class TransactionInfo implements Parcelable, Comparable<TransactionInfo>
    public String hash;
    public long timestamp;
    public String paymentId;
-    public int account;
-    public int subaddress;
+    public int accountIndex;
+    public int addressIndex;
    public long confirmations;
    public String subaddressLabel;
    public List<Transfer> transfers;
@@ -80,8 +79,8 @@ public class TransactionInfo implements Parcelable, Comparable<TransactionInfo>
            String hash,
            long timestamp,
            String paymentId,
-            int account,
-            int subaddress,
+            int accountIndex,
+            int addressIndex,
            long confirmations,
            String subaddressLabel,
            List<Transfer> transfers) {
@@ -94,13 +93,24 @@ public class TransactionInfo implements Parcelable, Comparable<TransactionInfo>
        this.hash = hash;
        this.timestamp = timestamp;
        this.paymentId = paymentId;
-        this.account = account;
-        this.subaddress = subaddress;
+        this.accountIndex = accountIndex;
+        this.addressIndex = addressIndex;
        this.confirmations = confirmations;
        this.subaddressLabel = subaddressLabel;
        this.transfers = transfers;
    }

+    public boolean isConfirmed() {
+        return confirmations >= CONFIRMATION;
+    }
+
+    public String getDisplayLabel() {
+        if (subaddressLabel.isEmpty() || (Subaddress.DEFAULT_LABEL_FORMATTER.matcher(subaddressLabel).matches()))
+            return ("#" + addressIndex);
+        else
+            return subaddressLabel;
+    }
+
    public String toString() {
        return direction + "@" + blockheight + " " + amount;
    }
@@ -116,8 +126,8 @@ public class TransactionInfo implements Parcelable, Comparable<TransactionInfo>
        out.writeString(hash);
        out.writeLong(timestamp);
        out.writeString(paymentId);
-        out.writeInt(account);
-        out.writeInt(subaddress);
+        out.writeInt(accountIndex);
+        out.writeInt(addressIndex);
        out.writeLong(confirmations);
        out.writeString(subaddressLabel);
        out.writeList(transfers);
@@ -146,8 +156,8 @@ public class TransactionInfo implements Parcelable, Comparable<TransactionInfo>
        hash = in.readString();
        timestamp = in.readLong();
        paymentId = in.readString();
-        account = in.readInt();
-        subaddress = in.readInt();
+        accountIndex = in.readInt();
+        addressIndex = in.readInt();
        confirmations = in.readLong();
        subaddressLabel = in.readString();
        transfers = in.readArrayList(Transfer.class.getClassLoader());
--- a/app/src/main/java/com/m2049r/xmrwallet/model/Wallet.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/model/Wallet.java
@@ -19,6 +19,7 @@ package com.m2049r.xmrwallet.model;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

+import com.m2049r.xmrwallet.data.Subaddress;
 import com.m2049r.xmrwallet.data.TxData;

 import java.io.File;
@@ -26,6 +27,8 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;

+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import timber.log.Timber;

 public class Wallet {
@@ -104,10 +107,14 @@ public class Wallet {
        this.accountIndex = accountIndex;
    }

+    @RequiredArgsConstructor
+    @Getter
    public enum Device {
-        Device_Undefined,
-        Device_Software,
-        Device_Ledger
+        Device_Undefined(0, 0),
+        Device_Software(50, 200),
+        Device_Ledger(5, 20);
+        private final int accountLookahead;
+        private final int subaddressLookahead;
    }

    public enum StatusEnum {
@@ -160,6 +167,24 @@ public class Wallet {

    private native String getAddressJ(int accountIndex, int addressIndex);

+    public Subaddress getSubaddressObject(int accountIndex, int subAddressIndex) {
+        return new Subaddress(accountIndex, subAddressIndex,
+                getSubaddress(subAddressIndex), getSubaddressLabel(subAddressIndex));
+    }
+
+    public Subaddress getSubaddressObject(int subAddressIndex) {
+        Subaddress subaddress = getSubaddressObject(accountIndex, subAddressIndex);
+        long amount = 0;
+        for (TransactionInfo info : getHistory().getAll()) {
+            if ((info.addressIndex == subAddressIndex)
+                    && (info.direction == TransactionInfo.Direction.Direction_In)) {
+                amount += info.amount;
+            }
+        }
+        subaddress.setAmount(amount);
+        return subaddress;
+    }
+
    public native String getPath();

    public NetworkType getNetworkType() {
@@ -248,12 +273,14 @@ public class Wallet {

    public native long getDaemonBlockChainTargetHeight();

-    public native boolean isSynchronizedJ();
+    boolean synced = false;

    public boolean isSynchronized() {
-        final long daemonHeight = getDaemonBlockChainHeight();
-        if (daemonHeight == 0) return false;
-        return isSynchronizedJ() && (getBlockChainHeight() == daemonHeight);
+        return synced;
+    }
+
+    public void setSynchronized() {
+        this.synced = true;
    }

    public static native String getDisplayAmount(long amount);
@@ -284,7 +311,12 @@ public class Wallet {

    public native void refreshAsync();

-    public native void rescanBlockchainAsync();
+    public native void rescanBlockchainAsyncJ();
+
+    public void rescanBlockchainAsync() {
+        synced = false;
+        rescanBlockchainAsyncJ();
+    }

 //TODO virtual void setAutoRefreshInterval(int millis) = 0;
 //TODO virtual int autoRefreshInterval() const = 0;
@@ -366,6 +398,10 @@ public class Wallet {

    private native long getHistoryJ();

+    public void refreshHistory() {
+        getHistory().refreshWithNotes(this);
+    }
+
 //virtual AddressBook * addressBook() const = 0;
 //virtual void setListener(WalletListener *) = 0;

@@ -428,6 +464,11 @@ public class Wallet {
        setSubaddressLabel(accountIndex, 0, label);
    }

+    public void setSubaddressLabel(int addressIndex, String label) {
+        setSubaddressLabel(accountIndex, addressIndex, label);
+        refreshHistory();
+    }
+
    public native void setSubaddressLabel(int accountIndex, int addressIndex, String label);

    public native int getNumAccounts();
--- a/app/src/main/java/com/m2049r/xmrwallet/model/WalletManager.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/model/WalletManager.java
@@ -21,15 +21,13 @@ import com.m2049r.xmrwallet.data.Node;
 import com.m2049r.xmrwallet.ledger.Ledger;
 import com.m2049r.xmrwallet.util.RestoreHeight;

-import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileReader;
 import java.io.FilenameFilter;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;

+import lombok.Getter;
 import timber.log.Timber;

 public class WalletManager {
@@ -103,7 +101,8 @@ public class WalletManager {
            wallet.setRestoreHeight(restoreHeight);
            Timber.d("Changed Restore Height from %d to %d", oldHeight, wallet.getRestoreHeight());
            wallet.setPassword(password); // this rewrites the keys file (which contains the restore height)
-        }
+        } else
+            Timber.e(wallet.getStatus().toString());
        return wallet;
    }

@@ -210,46 +209,22 @@ public class WalletManager {
    //public native List<String> findWallets(String path); // this does not work - some error in boost

    public class WalletInfo implements Comparable<WalletInfo> {
-        public File path;
-        public String name;
-        public String address;
+        @Getter
+        final private File path;
+        @Getter
+        final private String name;
+
+        public WalletInfo(File wallet) {
+            path = wallet.getParentFile();
+            name = wallet.getName();
+        }

        @Override
        public int compareTo(WalletInfo another) {
-            int n = name.toLowerCase().compareTo(another.name.toLowerCase());
-            if (n != 0) {
-                return n;
-            } else { // wallet names are the same
-                return address.compareTo(another.address);
-            }
+            return name.toLowerCase().compareTo(another.name.toLowerCase());
        }
    }

-    public WalletInfo getWalletInfo(File wallet) {
-        WalletInfo info = new WalletInfo();
-        info.path = wallet.getParentFile();
-        info.name = wallet.getName();
-        File addressFile = new File(info.path, info.name + ".address.txt");
-        //Timber.d(addressFile.getAbsolutePath());
-        info.address = "??????";
-        BufferedReader addressReader = null;
-        try {
-            addressReader = new BufferedReader(new FileReader(addressFile));
-            info.address = addressReader.readLine();
-        } catch (IOException ex) {
-            Timber.d(ex.getLocalizedMessage());
-        } finally {
-            if (addressReader != null) {
-                try {
-                    addressReader.close();
-                } catch (IOException ex) {
-                    // that's just too bad
-                }
-            }
-        }
-        return info;
-    }
-
    public List<WalletInfo> findWallets(File path) {
        List<WalletInfo> wallets = new ArrayList<>();
        Timber.d("Scanning: %s", path.getAbsolutePath());
@@ -261,7 +236,7 @@ public class WalletManager {
        for (int i = 0; i < found.length; i++) {
            String filename = found[i].getName();
            File f = new File(found[i].getParent(), filename.substring(0, filename.length() - 5)); // 5 is length of ".keys"+1
-            wallets.add(getWalletInfo(f));
+            wallets.add(new WalletInfo(f));
        }
        return wallets;
    }
--- a/app/src/main/java/com/m2049r/xmrwallet/service/WalletService.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/service/WalletService.java
@@ -108,23 +108,23 @@ public class WalletService extends Service {
            Timber.d("unconfirmedMoneyReceived() %d @ %s", amount, txId);
        }

-        long lastBlockTime = 0;
-        int lastTxCount = 0;
+        private long lastBlockTime = 0;
+        private int lastTxCount = 0;

        public void newBlock(long height) {
-            Wallet wallet = getWallet();
+            final Wallet wallet = getWallet();
            if (wallet == null) throw new IllegalStateException("No wallet!");
            // don't flood with an update for every block ...
            if (lastBlockTime < System.currentTimeMillis() - 2000) {
-                Timber.d("newBlock() @ %d with observer %s", height, observer);
                lastBlockTime = System.currentTimeMillis();
+                Timber.d("newBlock() @ %d with observer %s", height, observer);
                if (observer != null) {
                    boolean fullRefresh = false;
                    updateDaemonState(wallet, wallet.isSynchronized() ? height : 0);
                    if (!wallet.isSynchronized()) {
                        updated = true;
                        // we want to see our transactions as they come in
-                        wallet.getHistory().refresh();
+                        wallet.refreshHistory();
                        int txCount = wallet.getHistory().getCount();
                        if (txCount > lastTxCount) {
                            // update the transaction list only if we have more than before
@@ -145,17 +145,16 @@ public class WalletService extends Service {
            updated = true;
        }

-        public void refreshed() {
+        public void refreshed() { // this means it's synced
            Timber.d("refreshed()");
-            Wallet wallet = getWallet();
+            final Wallet wallet = getWallet();
            if (wallet == null) throw new IllegalStateException("No wallet!");
+            wallet.setSynchronized();
            if (updated) {
+                updateDaemonState(wallet, wallet.getBlockChainHeight());
+                wallet.refreshHistory();
                if (observer != null) {
-                    updateDaemonState(wallet, 0);
-                    wallet.getHistory().refreshWithNotes(wallet);
-                    if (observer != null) {
-                        updated = !observer.onRefreshed(wallet, true);
-                    }
+                    updated = !observer.onRefreshed(wallet, true);
                }
            }
        }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
m2049r	506e6ce017	bump version	2021-10-27 08:37:52 +02:00
m2049r	f07b439731	correct settleAmount formatting for non-US locales (#791 )	2021-10-26 17:36:03 +02:00
m2049r	ac70ba8424	bump version	2021-09-08 13:53:57 +02:00
m2049r	84ec1ef418	load notes on refresh (#783 )	2021-09-08 13:52:23 +02:00
m2049r	b576a9de3d	bump version	2021-09-05 21:58:19 +02:00
m2049r	148faa00e4	minor fixes for confirmations indicator (#782 )	2021-09-05 21:24:53 +02:00
m2049r	e82b471c14	adaptaions for monero v0.17.2.3 (#781 )	2021-09-05 21:23:12 +02:00
m2049r	9ed92e5117	remove defunct strings in arabic	2021-08-07 12:31:42 +02:00
m2049r	303b3aa354	dont update on every single block (#776 )	2021-08-07 11:58:54 +02:00
phwright	d801a50962	Arabic Translation (#767 ) * Arabic Translation	2021-08-07 11:19:24 +02:00
m2049r	9cd8a75dc6	confirmations indicator (#775 )	2021-08-07 11:17:13 +02:00
m2049r	002dfd5d58	rewrite Wallet.isSynchronized() (#774 )	2021-08-07 11:04:18 +02:00
paxriel	54e54b2a8a	Fixed boost JFrog repo (#772 )	2021-08-04 10:37:31 +02:00
m2049r	aa768596a4	bump version	2021-05-21 08:49:13 +02:00
m2049r	c4958f6c54	use settleAmount (#768 )	2021-05-21 08:45:45 +02:00
m2049r	2c2a5314d4	fix migration of devices with permission timeouts	2021-05-19 22:20:47 +02:00
m2049r	669516c60b	add USE_FINGERPRINT again (#766 ) and update sdk	2021-05-06 00:03:39 +02:00
m2049r	a56a29a6c4	bump version	2021-05-02 10:36:52 +02:00
m2049r	4e31f47482	new logo (#764 )	2021-05-02 09:56:26 +02:00
m2049r	c1f14f9653	update gradle & deps & bump version (#760 )	2021-04-25 18:24:30 +02:00
m2049r	2746c52d7b	confirm checkboxes for delete confirmation dialogs (#759 )	2021-04-25 14:26:46 +02:00
Baltsar	5df323bacb	Update Swedish strings.xml (#754 )	2021-04-23 23:32:31 +02:00
m2049r	776cc26377	refactor magic number (#756 )	2021-04-23 08:57:08 +02:00
m2049r	bdfb6a90b6	update & clean build (#755 )	2021-04-22 20:17:02 +02:00
m2049r	6db44dfab1	cleanup backup code (#753 )	2021-04-21 19:54:20 +02:00
m2049r	c68ac7db6d	bump version	2021-04-20 17:08:51 +02:00
Katant Savelev	e09862e940	Ru update for #751 (#752 )	2021-04-20 17:01:01 +02:00
m2049r	c7bd7469a1	reset wallet by deleting wallet cache file (#751 )	2021-04-20 13:06:14 +02:00
Katant Savelev	b39857fd2e	Russian translation update (#746 ) * Ru update * Better external libs build guide * Update BUILDING-external-libs.md	2021-04-20 12:50:48 +02:00
m2049r	8170f823ab	bump version	2021-04-19 18:41:09 +02:00
m2049r	38c0ead45c	random fixes (#747 )	2021-04-19 17:39:12 +02:00
m2049r	1d027c1694	fix translation	2021-04-18 19:39:00 +02:00
Vlad	45dc21fbf7	Update Romanian translation (#739 ) Co-authored-by: m2049r <m2049r@monerujo.io>	2021-04-18 19:19:42 +02:00
netrik182	d4f4de234a	pt-br translation of new strings (#735 )	2021-04-18 19:17:29 +02:00
m2049r	394d5471e3	show total incoming amount (#745 )	2021-04-18 19:16:52 +02:00
m2049r	beb098adb3	build version	2021-04-18 17:38:28 +02:00
m2049r	fda370d35b	bump version	2021-04-18 16:57:58 +02:00
m2049r	99681e1bbb	fix permissions Q needs to read our old wallet files (#744 )	2021-04-18 16:55:14 +02:00
m2049r	21f44380b1	remove persmissions	2021-04-18 13:29:16 +02:00
m2049r	f4c1af1bb8	Some refactoring (#742 ) * configure enabling of shift & exchange * refactor qr logo code * fix rename wallet	2021-04-17 21:03:32 +02:00
m2049r	c002b81ebd	use default mixin	2021-04-15 19:10:56 +02:00
m2049r	d2f07ba3b6	migrate to scoped storage and API 30 (#741 )	2021-04-15 19:10:01 +02:00
m2049r	24fc27b09e	show new incoming tx in subaddress details (#734 )	2021-03-23 19:05:30 +01:00
m2049r	cf4ff856d5	Subaddresses as first class citizens (#733 )	2021-03-22 00:31:01 +01:00
m2049r	b01de1ad6e	bump version	2021-03-20 09:14:51 +01:00
anhdres	5fb1bcb552	Update strings.xml (#732 ) several gender mistakes ("monedero" we're using now is masculine) ledger translations onboarding sideshift integration	2021-03-19 23:38:03 +01:00
anhdres	b937ba38b6	Update help.xml (#731 ) translated new text and help_ok string	2021-03-19 23:36:32 +01:00