Merge from upstream and fix conflicts

app/build.gradle

@@ -14,9 +14,8 @@ android {
         applicationId "io.lbry.browser"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 1615
+        versionCode 1700
-        versionName "0.16.15"
+        versionName "0.17.0"
-
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -120,7 +119,7 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
-    __32bitImplementation 'io.lbry:lbrysdk32:0.88.0'
+    __32bitImplementation 'io.lbry:lbrysdk32:0.91.0'
-//    __64bitImplementation 'io.lbry:lbrysdk64:0.88.0'
+//    __64bitImplementation 'io.lbry:lbrysdk64:0.91.0'
 }
 

app/src/main/java/io/lbry/browser/VerificationActivity.java

@@ -121,17 +121,18 @@ public class VerificationActivity extends FragmentActivity implements SignInList
             } else if (flow == VERIFICATION_FLOW_REWARDS) {
                 User user = Lbryio.currentUser;
                 // disable phone verification for now
-                /*if (!user.isIdentityVerified()) {
+                if (!user.isIdentityVerified()) {
                     // phone number verification required
                     viewPager.setCurrentItem(VerificationPagerAdapter.PAGE_VERIFICATION_PHONE, false);
                     flowHandled = true;
-                } else */
+                } else {
                     if (!user.isRewardApproved()) {
                         // manual verification required
                         viewPager.setCurrentItem(VerificationPagerAdapter.PAGE_VERIFICATION_MANUAL, false);
                         flowHandled = true;
                     }
                 }
+            }
 
             if (!flowHandled) {
                 // user has already been verified and or reward approved
@@ -142,6 +143,11 @@ public class VerificationActivity extends FragmentActivity implements SignInList
         }
     }
 
+    public void showPhoneVerification() {
+        ViewPager2 viewPager = findViewById(R.id.verification_pager);
+        viewPager.setCurrentItem(VerificationPagerAdapter.PAGE_VERIFICATION_PHONE, false);
+    }
+
     public void showLoading() {
         findViewById(R.id.verification_loading_progress).setVisibility(View.VISIBLE);
         findViewById(R.id.verification_pager).setVisibility(View.INVISIBLE);
@@ -155,8 +161,12 @@ public class VerificationActivity extends FragmentActivity implements SignInList
 
     @Override
     public void onBackPressed() {
-        // ignore back press
+        ViewPager2 viewPager = findViewById(R.id.verification_pager);
-        return;
+
+        if (viewPager.getCurrentItem() != VerificationPagerAdapter.PAGE_VERIFICATION_MANUAL)
+            viewPager.setCurrentItem(VerificationPagerAdapter.PAGE_VERIFICATION_MANUAL);
+        else
+            super.onBackPressed();
     }
 
     public void onEmailAdded(String email) {
@@ -213,14 +223,11 @@ public class VerificationActivity extends FragmentActivity implements SignInList
                     ViewPager2 viewPager = findViewById(R.id.verification_pager);
                     // for rewards, (show phone verification if not done, or manual verification if required)
                     if (flow == VERIFICATION_FLOW_REWARDS) {
-                        // skipping phone verification
+                        if (!user.isIdentityVerified()) {
-                        /*if (!user.isIdentityVerified()) {
                             // phone number verification required
                             viewPager.setCurrentItem(VerificationPagerAdapter.PAGE_VERIFICATION_PHONE, false);
-                        } else
+                        } else {
-                        */
                             if (!user.isRewardApproved()) {
-
                                 // manual verification required
                                 viewPager.setCurrentItem(VerificationPagerAdapter.PAGE_VERIFICATION_MANUAL, false);
                             } else {
@@ -228,6 +235,7 @@ public class VerificationActivity extends FragmentActivity implements SignInList
                                 setResult(RESULT_OK);
                                 finish();
                             }
+                        }
                     } else if (flow == VERIFICATION_FLOW_WALLET) {
                         // for wallet sync, if password unlock is required, show password entry page
                         viewPager.setCurrentItem(VerificationPagerAdapter.PAGE_VERIFICATION_WALLET, false);
@@ -264,6 +272,7 @@ public class VerificationActivity extends FragmentActivity implements SignInList
                     return;
                 }
 
+                findViewById(R.id.verification_close_button).setVisibility(View.VISIBLE);
                 // show manual verification page if the user is still not reward approved
                 ViewPager2 viewPager = findViewById(R.id.verification_pager);
                 viewPager.setCurrentItem(VerificationPagerAdapter.PAGE_VERIFICATION_MANUAL, false);

app/src/main/java/io/lbry/browser/adapter/WalletDetailAdapter.java

@@ -0,0 +1,100 @@
+package io.lbry.browser.adapter;
+
+import android.content.Context;
+import android.content.DialogInterface;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageButton;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import androidx.appcompat.app.AlertDialog;
+
+import java.util.List;
+
+import io.lbry.browser.MainActivity;
+import io.lbry.browser.R;
+import io.lbry.browser.model.WalletDetailItem;
+import io.lbry.browser.utils.Helper;
+import io.lbry.browser.views.CreditsBalanceView;
+
+public class WalletDetailAdapter extends BaseAdapter {
+    private final List<WalletDetailItem> list;
+    private final LayoutInflater inflater;
+
+    public WalletDetailAdapter(Context ctx, List<WalletDetailItem> rows) {
+        this.list = rows;
+        this.inflater = LayoutInflater.from(ctx);
+    }
+    @Override
+    public int getCount() {
+        return list.size();
+    }
+
+    @Override
+    public Object getItem(int i) {
+        return list.get(i);
+    }
+
+    @Override
+    public long getItemId(int i) {
+        return i;
+    }
+
+    @Override
+    public View getView(int i, View view, ViewGroup viewGroup) {
+        if (view == null) {
+            view = inflater.inflate(R.layout.list_item_boosting_balance, viewGroup, false);
+
+            CreditsBalanceView balanceView = view.findViewById(R.id.wallet_supporting_balance);
+            TextView detailTextView = view.findViewById(R.id.detail);
+            TextView detailExplanationTextView = view.findViewById(R.id.detail_explanation);
+
+            WalletDetailItem item = (WalletDetailItem) getItem(i);
+
+            detailTextView.setText(item.detail);
+            detailExplanationTextView.setText(item.detailDesc);
+
+            Helper.setViewText(balanceView, item.detailAmount);
+
+            ProgressBar progressUnlockTips = view.findViewById(R.id.wallet_unlock_tips_progress);
+            progressUnlockTips.setVisibility(item.isInProgress ? View.VISIBLE : View.GONE);
+
+            ImageButton buttonLock = view.findViewById(R.id.lock_button);
+            buttonLock.setVisibility((item.isUnlockable && !item.isInProgress) ? View.VISIBLE : View.GONE);
+
+            if (item.isUnlockable) {
+                buttonLock.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        if (view.getContext() != null) {
+                            AlertDialog.Builder builder = new AlertDialog.Builder(view.getContext()).
+                                    setTitle(R.string.unlock_tips).
+                                    setMessage(R.string.confirm_unlock_tips)
+                                    .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+                                        @Override
+                                        public void onClick(DialogInterface dialogInterface, int i) {
+                                            unlockTips(view);
+                                        }
+                                    }).setNegativeButton(R.string.no, null);
+                            builder.show();
+                        }
+                    }
+                });
+            }
+        }
+        return view;
+    }
+
+    private void unlockTips(View v) {
+        Context ctx = v.getContext();
+        if (ctx instanceof MainActivity) {
+            v.setVisibility(View.GONE);
+            View progress = v.getRootView().findViewById(R.id.wallet_unlock_tips_progress);
+            progress.setVisibility(View.VISIBLE);
+            ((MainActivity) ctx).unlockTips();
+        }
+    }
+}

app/src/main/java/io/lbry/browser/model/WalletDetailItem.java

@@ -0,0 +1,17 @@
+package io.lbry.browser.model;
+
+public class WalletDetailItem {
+    public String detail;
+    public String detailDesc;
+    public String detailAmount;
+    public boolean isUnlockable;
+    public boolean isInProgress;
+
+    public WalletDetailItem(String detail, String detailDesc, String detailAmount, boolean isUnlockable, boolean isInProgress) {
+        this.detail = detail;
+        this.detailDesc = detailDesc;
+        this.detailAmount = detailAmount;
+        this.isUnlockable = isUnlockable;
+        this.isInProgress = isInProgress;
+    }
+}

app/src/main/java/io/lbry/browser/ui/findcontent/FileViewFragment.java

@@ -564,7 +564,7 @@ public class FileViewFragment extends BaseFragment implements
                 webView.setWebViewClient(new LbryWebViewClient(ctx));
                 WebSettings webSettings = webView.getSettings();
                 webSettings.setAllowFileAccess(true);
-                webSettings.setJavaScriptEnabled(true);
+                webSettings.setJavaScriptEnabled(false);
             }
 
             if (!webViewAdded && root != null) {

app/src/main/java/io/lbry/browser/ui/verification/ManualVerificationFragment.java

@@ -9,6 +9,7 @@ import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 
 import io.lbry.browser.R;
+import io.lbry.browser.VerificationActivity;
 import io.lbry.browser.listener.SignInListener;
 import io.lbry.browser.utils.Helper;
 import lombok.Setter;

app/src/main/java/io/lbry/browser/ui/wallet/WalletFragment.java

@@ -3,12 +3,12 @@ package io.lbry.browser.ui.wallet;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.transition.TransitionManager;
 import android.util.Base64;
 import android.view.GestureDetector;
 import android.view.LayoutInflater;
@@ -16,11 +16,11 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageButton;
+import android.widget.ListView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
 import androidx.browser.customtabs.CustomTabsIntent;
 import androidx.core.content.ContextCompat;
 import androidx.preference.PreferenceManager;
@@ -41,6 +41,7 @@ import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
@@ -50,21 +51,23 @@ import javax.crypto.spec.SecretKeySpec;
 import io.lbry.browser.MainActivity;
 import io.lbry.browser.R;
 import io.lbry.browser.adapter.TransactionListAdapter;
+import io.lbry.browser.adapter.WalletDetailAdapter;
 import io.lbry.browser.listener.SdkStatusListener;
 import io.lbry.browser.listener.WalletBalanceListener;
 import io.lbry.browser.model.NavMenuItem;
 import io.lbry.browser.model.Transaction;
 import io.lbry.browser.model.WalletBalance;
+import io.lbry.browser.model.WalletDetailItem;
 import io.lbry.browser.tasks.wallet.TransactionListTask;
 import io.lbry.browser.tasks.wallet.WalletAddressUnusedTask;
 import io.lbry.browser.tasks.wallet.WalletSendTask;
 import io.lbry.browser.ui.BaseFragment;
-import io.lbry.browser.ui.publish.PublishFragment;
 import io.lbry.browser.utils.Helper;
 import io.lbry.browser.utils.Lbry;
 import io.lbry.browser.utils.LbryAnalytics;
 import io.lbry.browser.utils.LbryUri;
 import io.lbry.browser.utils.Lbryio;
+import io.lbry.browser.views.CreditsBalanceView;
 
 public class WalletFragment extends BaseFragment implements SdkStatusListener, WalletBalanceListener {
 
@@ -75,16 +78,17 @@ public class WalletFragment extends BaseFragment implements SdkStatusListener, W
     private View layoutAccountRecommended;
     private View layoutSdkInitializing;
     private View linkSkipAccount;
-    private TextView textWalletBalance;
+    private CreditsBalanceView walletTotalBalanceView;
+    private CreditsBalanceView walletSpendableBalanceView;
+    private CreditsBalanceView walletSupportingBalanceView;
     private TextView textWalletBalanceUSD;
-    private TextView textTipsBalance;
+    private TextView textWalletBalanceDesc;
-    private TextView textTipsBalanceUSD;
+    private TextView buttonViewMore;
-    private TextView textClaimsBalance;
+    private ListView detailListView;
-    private TextView textSupportsBalance;
+    List<WalletDetailItem> detailRows;
-    private ProgressBar walletSendProgress;
+    private WalletDetailAdapter detailAdapter;
 
-    private TextView linkUnlockTips;
+    private ProgressBar walletSendProgress;
-    private ProgressBar progressUnlockTips;
 
     private View loadingRecentContainer;
     private View inlineBalanceContainer;
@@ -95,7 +99,6 @@ public class WalletFragment extends BaseFragment implements SdkStatusListener, W
     private View linkViewAll;
     private TextView textConvertCredits;
     private TextView textConvertCreditsBittrex;
-    private TextView textEarnMoreTips;
     private TextView textWhatSyncMeans;
     private TextView textWalletReceiveAddress;
     private TextView textWalletHintSyncStatus;
@@ -127,16 +130,14 @@ public class WalletFragment extends BaseFragment implements SdkStatusListener, W
         textWalletInlineBalance = root.findViewById(R.id.wallet_inline_balance_value);
         walletSendProgress = root.findViewById(R.id.wallet_send_progress);
 
-        textWalletBalance = root.findViewById(R.id.wallet_balance_value);
+        walletTotalBalanceView = root.findViewById(R.id.wallet_total_balance);
+        walletSpendableBalanceView = root.findViewById(R.id.wallet_spendable_balance);
+        walletSupportingBalanceView = root.findViewById(R.id.wallet_supporting_balance);
         textWalletBalanceUSD = root.findViewById(R.id.wallet_balance_usd_value);
-        textTipsBalance = root.findViewById(R.id.wallet_balance_tips);
+        textWalletBalanceDesc = root.findViewById(R.id.total_balance_desc);
-        textTipsBalanceUSD = root.findViewById(R.id.wallet_balance_tips_usd_value);
-        textClaimsBalance = root.findViewById(R.id.wallet_balance_staked_publishes);
-        textSupportsBalance = root.findViewById(R.id.wallet_balance_staked_supports);
         textWalletHintSyncStatus = root.findViewById(R.id.wallet_hint_sync_status);
-
+        buttonViewMore = root.findViewById(R.id.view_more_button);
-        linkUnlockTips = root.findViewById(R.id.wallet_unlock_tips_link);
+        detailListView = root.findViewById(R.id.balance_detail_listview);
-        progressUnlockTips = root.findViewById(R.id.wallet_unlock_tips_progress);
 
         recentTransactionsList = root.findViewById(R.id.wallet_recent_transactions_list);
         linkViewAll = root.findViewById(R.id.wallet_link_view_all);
@@ -144,7 +145,6 @@ public class WalletFragment extends BaseFragment implements SdkStatusListener, W
         buttonBuyLBC = root.findViewById(R.id.wallet_buy_lbc_button);
         textConvertCredits = root.findViewById(R.id.wallet_hint_convert_credits);
         textConvertCreditsBittrex = root.findViewById(R.id.wallet_hint_convert_credits_bittrex);
-        textEarnMoreTips = root.findViewById(R.id.wallet_hint_earn_more_tips);
         textWhatSyncMeans = root.findViewById(R.id.wallet_hint_what_sync_means);
         textWalletReceiveAddress = root.findViewById(R.id.wallet_receive_address);
         buttonCopyReceiveAddress = root.findViewById(R.id.wallet_copy_receive_address);
@@ -267,29 +267,26 @@ public class WalletFragment extends BaseFragment implements SdkStatusListener, W
         itemDecoration.setDrawable(ContextCompat.getDrawable(context, R.drawable.thin_divider));
         recentTransactionsList.addItemDecoration(itemDecoration);
 
-        linkUnlockTips.setOnClickListener(new View.OnClickListener() {
+        detailRows = new ArrayList(3);
-            @Override
-            public void onClick(View view) {
-                if (context != null) {
-                    AlertDialog.Builder builder = new AlertDialog.Builder(context).
-                            setTitle(R.string.unlock_tips).
-                            setMessage(R.string.confirm_unlock_tips)
-                            .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialogInterface, int i) {
-                                    unlockTips();
-                                }
-                            }).setNegativeButton(R.string.no, null);
-                    builder.show();
-                }
-            }
-        });
 
-        textEarnMoreTips.setOnClickListener(new View.OnClickListener() {
+        detailAdapter = new WalletDetailAdapter((MainActivity) context, detailRows);
+        detailListView.setAdapter(detailAdapter);
+
+        buttonViewMore.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
+                Context context = getContext();
                 if (context instanceof MainActivity) {
-                    ((MainActivity) context).openFragment(PublishFragment.class, true, NavMenuItem.ID_ITEM_NEW_PUBLISH);
+                    View walletDetail = ((MainActivity) context).findViewById(R.id.balance_detail_listview);
+
+                    if (walletDetail.getVisibility() == View.GONE) {
+                        TransitionManager.beginDelayedTransition((ViewGroup) walletDetail.getParent());
+                        walletDetail.setVisibility(View.VISIBLE);
+                        buttonViewMore.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, R.drawable.ic_arrow_dropup, 0);
+                    } else {
+                        walletDetail.setVisibility(View.GONE);
+                        buttonViewMore.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, R.drawable.ic_arrow_dropdown, 0);
+                    }
                 }
             }
         });
@@ -638,36 +635,92 @@ public class WalletFragment extends BaseFragment implements SdkStatusListener, W
     }
 
     public void onWalletBalanceUpdated(WalletBalance walletBalance) {
-        double balance = walletBalance.getAvailable().doubleValue();
+        double totalBalance = walletBalance.getTotal().doubleValue();
-        double usdBalance = balance * Lbryio.LBCUSDRate;
+        double spendableBalance = walletBalance.getAvailable().doubleValue();
+        double supportingBalance = walletBalance.getClaims().doubleValue() + walletBalance.getTips().doubleValue() + walletBalance.getSupports().doubleValue();
+        double usdBalance = spendableBalance * Lbryio.LBCUSDRate;
         double tipsBalance = walletBalance.getTips().doubleValue();
-        double tipsUsdBalance = tipsBalance * Lbryio.LBCUSDRate;
 
-        String formattedBalance = Helper.SIMPLE_CURRENCY_FORMAT.format(balance);
+        if (detailRows == null)
-        Helper.setViewText(textWalletBalance, balance > 0 && formattedBalance.equals("0") ? Helper.FULL_LBC_CURRENCY_FORMAT.format(balance) : formattedBalance);
+            detailRows = new ArrayList<>(3);
-        Helper.setViewText(textTipsBalance, Helper.shortCurrencyFormat(tipsBalance));
+
-        Helper.setViewText(textClaimsBalance, Helper.shortCurrencyFormat(walletBalance.getClaims().doubleValue()));
+        if (detailAdapter == null) {
-        Helper.setViewText(textSupportsBalance, Helper.shortCurrencyFormat(walletBalance.getSupports().doubleValue()));
+            detailAdapter = new WalletDetailAdapter((MainActivity) getContext(), detailRows);
-        Helper.setViewText(textWalletInlineBalance, Helper.shortCurrencyFormat(balance));
+            detailListView.setAdapter(detailAdapter);
+        }
+
+        WalletDetailItem earnedBalance = new WalletDetailItem(getResources().getString(R.string.earned_from_others), getResources().getString(R.string.unlock_to_spend), Helper.SIMPLE_CURRENCY_FORMAT.format(tipsBalance), tipsBalance != 0, ((MainActivity) getContext()).isUnlockingTips());
+        WalletDetailItem initialPublishes = new WalletDetailItem(getResources().getString(R.string.on_initial_publishes), getResources().getString(R.string.delete_or_edit_past_content), Helper.SIMPLE_CURRENCY_FORMAT.format(walletBalance.getClaims().doubleValue()), false, false);
+        WalletDetailItem supportingContent = new WalletDetailItem(getResources().getString(R.string.supporting_content), getResources().getString(R.string.delete_supports_to_spend), Helper.SIMPLE_CURRENCY_FORMAT.format(walletBalance.getSupports().doubleValue()), false, false);
+
+        boolean needNotifyAdapter = false;
+        boolean firstDatasetNotification;
+
+        if (detailRows.size() == 0) {
+            detailRows.add(0, earnedBalance);
+            detailRows.add(1, initialPublishes);
+            detailRows.add(2, supportingContent);
+            needNotifyAdapter = true;
+            firstDatasetNotification = true;
+        } else {
+            firstDatasetNotification = false;
+            if (!detailRows.get(0).detailAmount.equals(earnedBalance.detailAmount)
+                 || detailRows.get(0).isInProgress != earnedBalance.isInProgress
+                 || detailRows.get(0).isUnlockable != earnedBalance.isUnlockable) {
+                detailRows.set(0, earnedBalance);
+                needNotifyAdapter = true;
+            }
+            if (!detailRows.get(1).detailAmount.equals(initialPublishes.detailAmount)) {
+                detailRows.set(1, initialPublishes);
+                needNotifyAdapter = true;
+            }
+            if (!detailRows.get(2).detailAmount.equals(supportingContent.detailAmount)) {
+                detailRows.set(2, supportingContent);
+                needNotifyAdapter = true;
+            }
+        }
+
+        if (needNotifyAdapter) {
+            // notifyDatasetChanged() doesn't work, so simply reset the adapter to the list
+            // to update the view
+            detailListView.setAdapter(detailAdapter);
+
+            if (firstDatasetNotification) {
+                int listHeight = Math.round(getResources().getDisplayMetrics().density);
+
+                for (int i = 0; i < detailRows.size(); i++) {
+                    View item = detailAdapter.getView(i, null, detailListView);
+                    item.measure(0, 0);
+                    listHeight += item.getMeasuredHeight();
+                }
+
+                // Avoid scroll bars being displayed
+                ViewGroup.LayoutParams params = detailListView.getLayoutParams();
+                params.height = listHeight + (detailListView.getCount() + 1) * detailListView.getDividerHeight();
+                detailListView.setLayoutParams(params);
+                detailListView.setVerticalScrollBarEnabled(false);
+                detailListView.requestLayout();
+            }
+        }
+
+        String formattedTotalBalance = Helper.REDUCED_LBC_CURRENCY_FORMAT.format(totalBalance);
+        String formattedSpendableBalance = Helper.SIMPLE_CURRENCY_FORMAT.format(spendableBalance);
+        String formattedSupportingBalance = Helper.SIMPLE_CURRENCY_FORMAT.format(supportingBalance);
+        Helper.setViewText(walletTotalBalanceView, totalBalance > 0 && formattedTotalBalance.equals("0") ? Helper.FULL_LBC_CURRENCY_FORMAT.format(totalBalance) : formattedTotalBalance);
+        Helper.setViewText(walletSpendableBalanceView, spendableBalance > 0 && formattedSpendableBalance.equals("0") ? Helper.FULL_LBC_CURRENCY_FORMAT.format(spendableBalance) : formattedSpendableBalance);
+        Helper.setViewText(walletSupportingBalanceView, supportingBalance > 0 && formattedSupportingBalance.equals("0") ? Helper.FULL_LBC_CURRENCY_FORMAT.format(supportingBalance) : formattedSupportingBalance);
+        Helper.setViewText(textWalletInlineBalance, Helper.shortCurrencyFormat(spendableBalance));
         if (Lbryio.LBCUSDRate > 0) {
             // only update display usd values if the rate is loaded
             Helper.setViewText(textWalletBalanceUSD, String.format("≈$%s", Helper.SIMPLE_CURRENCY_FORMAT.format(usdBalance)));
-            Helper.setViewText(textTipsBalanceUSD, String.format("≈$%s", Helper.SIMPLE_CURRENCY_FORMAT.format(tipsUsdBalance)));
         }
 
+        textWalletBalanceDesc.setText(spendableBalance == totalBalance ? getResources().getString(R.string.your_total_balance) : getResources().getString(R.string.all_of_this_is_yours));
+
         checkTips();
         checkRewardsDriver();
     }
 
-    private void unlockTips() {
-        Context context = getContext();
-        if (context instanceof MainActivity) {
-            linkUnlockTips.setVisibility(View.GONE);
-            progressUnlockTips.setVisibility(View.VISIBLE);
-            ((MainActivity) context).unlockTips();
-        }
-    }
-
     public void checkTips() {
         checkTips(false);
     }
@@ -681,9 +734,6 @@ public class WalletFragment extends BaseFragment implements SdkStatusListener, W
             MainActivity activity = (MainActivity) context;
             unlocking = activity.isUnlockingTips();
         }
-
-        Helper.setViewVisibility(linkUnlockTips, !forceHideLink && tipBalance > 0 && !unlocking ? View.VISIBLE : View.GONE);
-        Helper.setViewVisibility(progressUnlockTips, unlocking ? View.VISIBLE : View.GONE);
     }
 
     private void checkRewardsDriver() {

app/src/main/java/io/lbry/browser/utils/Helper.java

@@ -77,6 +77,7 @@ public final class Helper {
     public static final String FILE_SIZE_FORMAT_PATTERN = "#,###.#";
     public static final DecimalFormat LBC_CURRENCY_FORMAT = new DecimalFormat(LBC_CURRENCY_FORMAT_PATTERN);
     public static final DecimalFormat FULL_LBC_CURRENCY_FORMAT = new DecimalFormat("#,###.########");
+    public static final DecimalFormat REDUCED_LBC_CURRENCY_FORMAT = new DecimalFormat("#,###.####");
     public static final DecimalFormat SIMPLE_CURRENCY_FORMAT = new DecimalFormat("#,##0.00");
     public static final SimpleDateFormat FILESTAMP_FORMAT =  new SimpleDateFormat("yyyyMMdd_HHmmss");
     public static final String EXPLORER_TX_PREFIX = "https://explorer.lbry.com/tx";

app/src/main/java/io/lbry/browser/utils/LbryUri.java

@@ -223,6 +223,9 @@ public class LbryUri {
         String secondaryClaimId = !Helper.isNullOrEmpty(secondaryClaimName) ? streamClaimId : null;
 
         if (!Helper.isNullOrEmpty(primaryClaimId)) {
+            if (protocol.equals(LBRY_TV_BASE_URL))
+                sb.append(':').append(primaryClaimId);
+            else
                 sb.append('#').append(primaryClaimId);
         } else if (primaryClaimSequence > 0) {
             sb.append(':').append(primaryClaimSequence);
@@ -235,6 +238,9 @@ public class LbryUri {
         }
 
         if (!Helper.isNullOrEmpty(secondaryClaimId)) {
+            if (protocol.equals(LBRY_TV_BASE_URL))
+                sb.append(':').append(secondaryClaimId);
+            else
                 sb.append('#').append(secondaryClaimId);
         } else if (secondaryClaimSequence > 0) {
             sb.append(':').append(secondaryClaimSequence);

app/src/main/java/io/lbry/browser/views/CreditsBalanceView.java

@@ -0,0 +1,69 @@
+package io.lbry.browser.views;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.util.DisplayMetrics;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+import io.lbry.browser.R;
+
+public class CreditsBalanceView extends TextView {
+    float textFontSize;
+    private float iconSize;
+    Rect r;
+    Paint p;
+
+    public CreditsBalanceView(Context context) {
+        super(context);
+    }
+
+    public CreditsBalanceView(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        r = new Rect();
+        p = new Paint();
+
+        TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.CreditsBalanceView,0, 0);
+
+        try {
+            textFontSize = a.getDimension(R.styleable.CreditsBalanceView_textSize, 24f);
+            iconSize = a.getDimension(R.styleable.CreditsBalanceView_iconSize, 20f);
+
+            this.setTextSize((int) textFontSize);
+
+            DisplayMetrics metrics = Resources.getSystem().getDisplayMetrics();
+            float px = 8 * (metrics.densityDpi / 160f);
+
+            setPadding((int) iconSize + Math.round(px), 0, 0, 0);
+        } finally {
+            a.recycle();
+        }
+
+    }
+
+    @Override
+    protected void onMeasure (int widthMeasureSpec, int heightMeasureSpec){
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    }
+
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+
+        drawLbryCredits(canvas);
+    }
+
+    private void drawLbryCredits(Canvas c) {
+        @SuppressLint("UseCompatLoadingForDrawables") Drawable icon = getResources().getDrawable(R.drawable.ic_credits, null);
+        float delta = (c.getHeight() - iconSize) / 2;
+        icon.setBounds(0, (int) delta, (int) iconSize, (int) (delta + iconSize));
+        icon.draw(c);
+    }
+}

app/src/main/res/layout/card_wallet_balance.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:lbry="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:elevation="4dp">
@@ -8,63 +9,122 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
-        <RelativeLayout
+        <LinearLayout
             android:background="@drawable/stripe_2x"
             android:layout_width="match_parent"
-            android:layout_height="220dp"
-            android:padding="16dp">
-            <TextView
-                android:id="@+id/wallet_balance_title"
-                android:text="@string/balance"
-                android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-                android:fontFamily="@font/inter"
+            android:padding="16dp"
-                android:textStyle="bold"
+            android:orientation="vertical">
-                android:textColor="@color/white"
-                android:textSize="20sp" />
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/wallet_balance_title"
-                android:layout_marginTop="4dp"
-                android:text="@string/you_currently_have"
-                android:fontFamily="@font/inter"
-                android:textFontWeight="600"
-                android:textColor="@color/caption"
-                android:textSize="16sp" />
 
-            <LinearLayout
+            <io.lbry.browser.views.CreditsBalanceView
-                android:layout_width="match_parent"
+                android:id="@+id/wallet_total_balance"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:layout_above="@id/wallet_balance_usd_value">
-                <ImageView
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginEnd="4dp"
-                    android:src="@drawable/ic_credits" />
-                <TextView
-                    android:id="@+id/wallet_balance_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                    android:fontFamily="@font/inter"
+                lbry:textSize="@dimen/wallet_total_balance_font_size"
-                    android:text="@string/zero"
+                lbry:iconSize="24dp"
                 android:textColor="@color/white"
-                    android:textSize="36sp"
+                android:textFontWeight="300" />
-                    android:textFontWeight="300"
+
-                    />
-            </LinearLayout>
             <TextView
                 android:id="@+id/wallet_balance_usd_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
                 android:fontFamily="@font/inter"
                 android:textColor="@color/white"
                 android:textSize="16sp"
                 android:textFontWeight="300" />
-        </RelativeLayout>
+
+            <TextView
+                android:id="@+id/total_balance_desc"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:fontFamily="@font/inter"
+                android:textColor="@color/white"
+                android:textFontWeight="300"
+                android:textSize="@dimen/wallet_detail_balance_desc_font_size" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0.5dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="16dp"
+                android:background="@color/lightDivider" />
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+                <io.lbry.browser.views.CreditsBalanceView
+                    android:id="@+id/wallet_spendable_balance"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    lbry:textSize="@dimen/wallet_detail_balance_font_size"
+                    lbry:iconSize="14dp"
+                    android:textColor="@color/white"
+                    android:textFontWeight="300" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="bottom"
+                    android:fontFamily="@font/inter"
+                    android:paddingStart="8dp"
+                    android:text="@string/immediately_spendable"
+                    android:textColor="@color/white"
+                    android:textFontWeight="300"
+                    android:textSize="@dimen/wallet_detail_balance_desc_font_size" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:orientation="horizontal">
+                <io.lbry.browser.views.CreditsBalanceView
+                    android:id="@+id/wallet_supporting_balance"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    lbry:textSize="@dimen/wallet_detail_balance_font_size"
+                    lbry:iconSize="14dp"
+                    android:textColor="@color/white"
+                    android:textFontWeight="300" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@font/inter"
+                    android:paddingStart="8dp"
+                    android:text="@string/boosting_content"
+                    android:textColor="@color/white"
+                    android:textFontWeight="300"
+                    android:textSize="@dimen/wallet_detail_balance_desc_font_size" />
+
+                <TextView
+                    android:id="@+id/view_more_button"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="18dp"
+                    android:drawableEnd="@drawable/ic_arrow_dropdown"
+                    android:gravity="end"
+                    android:text="@string/view_more"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/wallet_detail_balance_font_size" />
+            </LinearLayout>
+
+            <ListView
+                android:id="@+id/balance_detail_listview"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_marginTop="8dp"
+                android:visibility="gone">
+
+            </ListView>
+
+
+
+        </LinearLayout>
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/wallet_buy_lbc_button"
@@ -107,192 +167,6 @@
             android:layout_marginBottom="16dp"
             android:background="@color/lightDivider" />
 
-        <LinearLayout
-            android:weightSum="2"
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp">
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-                <io.lbry.browser.ui.controls.SolidIconView
-                    android:text="@string/fa_gift"
-                    android:layout_width="18dp"
-                    android:layout_height="18dp"
-                    android:textColor="@color/lbryGreen" />
-                <LinearLayout
-                    android:orientation="vertical"
-                    android:layout_marginStart="4dp"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="@font/inter"
-                        android:text="@string/you_also_have"
-                        android:textSize="14sp"
-                        android:textFontWeight="600"
-                        />
-
-                    <LinearLayout
-                        android:orientation="horizontal"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content">
-                        <ImageView
-                            android:layout_width="14dp"
-                            android:layout_height="14dp"
-                            android:layout_gravity="center_vertical"
-                            android:src="@drawable/ic_credits"
-                            android:layout_marginEnd="4dp" />
-                        <TextView
-                            android:id="@+id/wallet_balance_tips"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:fontFamily="@font/inter"
-                            android:text="0"
-                            android:textSize="24sp" />
-                    </LinearLayout>
-
-                    <TextView
-                        android:id="@+id/wallet_balance_tips_usd_value"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="@font/inter"
-                        android:textFontWeight="300"
-                        android:textSize="14sp" />
-
-                    <RelativeLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="16dp">
-                        <TextView
-                            android:id="@+id/wallet_in_tips_label"
-                            android:layout_centerVertical="true"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:fontFamily="@font/inter"
-                            android:text="@string/in_tips"
-                            android:textSize="14sp" />
-                        <TextView
-                            android:id="@+id/wallet_unlock_tips_link"
-                            android:background="?attr/selectableItemBackground"
-                            android:clickable="true"
-                            android:layout_centerVertical="true"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_toEndOf="@id/wallet_in_tips_label"
-                            android:fontFamily="@font/inter"
-                            android:layout_marginStart="24dp"
-                            android:text="@string/unlock"
-                            android:textColor="@color/lbryGreen"
-                            android:textSize="14sp"
-                            android:visibility="gone" />
-                        <ProgressBar
-                            android:id="@+id/wallet_unlock_tips_progress"
-                            android:layout_centerVertical="true"
-                            android:layout_width="16dp"
-                            android:layout_height="16dp"
-                            android:layout_marginStart="24dp"
-                            android:layout_toEndOf="@id/wallet_in_tips_label"
-                            android:visibility="gone" />
-
-                    </RelativeLayout>
-
-                    <TextView
-                        android:id="@+id/wallet_hint_earn_more_tips"
-                        android:clickable="true"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:fontFamily="@font/inter"
-                        android:text="@string/earn_more_tips"
-                        android:textColor="@color/lbryGreen"
-                        android:textSize="14sp" />
-                </LinearLayout>
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-                <io.lbry.browser.ui.controls.SolidIconView
-                    android:text="@string/fa_lock"
-                    android:layout_width="18dp"
-                    android:layout_height="18dp"
-                    android:textColor="@color/lbryGreen" />
-                <LinearLayout
-                    android:orientation="vertical"
-                    android:layout_marginStart="4dp"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="@font/inter"
-                        android:text="@string/you_staked"
-                        android:textSize="14sp"
-                        android:textFontWeight="600"
-                        />
-
-                    <LinearLayout
-                        android:orientation="horizontal"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content">
-                        <ImageView
-                            android:layout_width="14dp"
-                            android:layout_height="14dp"
-                            android:layout_gravity="center_vertical"
-                            android:src="@drawable/ic_credits"
-                            android:layout_marginEnd="4dp" />
-                        <TextView
-                            android:id="@+id/wallet_balance_staked_publishes"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:fontFamily="@font/inter"
-                            android:text="0"
-                            android:textSize="24sp" />
-                    </LinearLayout>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="@font/inter"
-                        android:text="@string/in_your_publishes"
-                        android:textSize="14sp" />
-
-                    <LinearLayout
-                        android:orientation="horizontal"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="16dp">
-                        <ImageView
-                            android:layout_width="14dp"
-                            android:layout_height="14dp"
-                            android:layout_gravity="center_vertical"
-                            android:src="@drawable/ic_credits"
-                            android:layout_marginEnd="4dp" />
-                        <TextView
-                            android:id="@+id/wallet_balance_staked_supports"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:fontFamily="@font/inter"
-                            android:text="0"
-                            android:textSize="24sp" />
-                    </LinearLayout>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="@font/inter"
-                        android:text="@string/in_your_supports"
-                        android:textSize="14sp" />
-                </LinearLayout>
-            </LinearLayout>
-        </LinearLayout>
 
         <LinearLayout
             android:background="@color/lbryGreen"

app/src/main/res/layout/fragment_verification_manual.xml

@@ -31,6 +31,33 @@
                 android:text="@string/reward_verification"
                 android:textColor="@color/white"
                 android:textFontWeight="300" />
+
+
+            <TextView
+                android:textSize="20sp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="36dp"
+                android:fontFamily="@font/inter"
+                android:text="@string/phone_number_verification"
+                android:textColor="@color/white"
+                android:textFontWeight="300" />
+            <TextView
+                android:textSize="16sp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:fontFamily="@font/inter"
+                android:text="@string/phone_number_verification_desc"
+                android:textColor="@color/white"
+                android:textFontWeight="300" />
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/verification_manual_phone_number_button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:fontFamily="@font/inter"
+                android:text="@string/phone_number_verify" />
             <TextView
                 android:textSize="20sp"
                 android:layout_width="match_parent"

app/src/main/res/layout/list_item_boosting_balance.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:lbry="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/relativeLayout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="8dp"
+    android:layout_marginBottom="16dp">
+
+    <TextView
+        android:id="@+id/detail"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:textColor="@color/white"
+        android:textSize="12sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/detail_explanation"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:textColor="@color/white"
+        android:textSize="12sp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@+id/detail"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ProgressBar
+        android:id="@+id/wallet_unlock_tips_progress"
+        android:layout_width="16dp"
+        android:layout_height="match_parent"
+        android:layout_centerVertical="true"
+        android:layout_marginEnd="8dp"
+        android:visibility="gone"
+        app:layout_constraintEnd_toStartOf="@id/wallet_supporting_balance" />
+
+    <ImageButton
+        android:id="@+id/lock_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        android:background="@android:color/transparent"
+        android:src="@drawable/ic_lock"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/wallet_supporting_balance"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <io.lbry.browser.views.CreditsBalanceView
+        android:id="@+id/wallet_supporting_balance"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:textColor="@color/white"
+        lbry:iconSize="18dp"
+        lbry:textSize="@dimen/wallet_detail_balance_font_size" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values-af/strings.xml

@@ -252,15 +252,8 @@
 
     <!-- Wallet -->
     <string name="balance">Balans</string>
-    <string name="you_currently_have">U het tans</string>
     <string name="convert_credits">U kan u krediete in USD omskakel en die omgeskakelde bedrag met \'n uitruil onttrek. &lt;a href=\"https://lbry.com/faq/exchanges\"&gt;Learn more&lt;/a&gt;.</string>
     <string name="convert_credits_bittrex">&lt;a href=\"https://bittrex.com/Account/Register?referralCode=4M1-P30-BON\"&gt;Skakel krediete na USD op Bittrex&lt;/a&gt;</string>
-    <string name="you_also_have">Jy het ook</string>
-    <string name="you_staked">Jy het vasgehou</string>
-    <string name="in_tips">in wenke</string>
-    <string name="in_your_publishes">in u publikasies</string>
-    <string name="in_your_supports">in u steun</string>
-    <string name="earn_more_tips">Verdien meer wenke deur cool video\'s op te laai</string>
     <string name="sdk_still_initializing">Die agtergronddiens word steeds geïnitialiseer. U kan die inhoud intussen verken en kyk.</string>
     <string name="sdk_initializing_functionality">U kan dit nie nou doen nie, want die agtergronddiens is nog besig om te initialiseer.</string>
 

app/src/main/res/values-ca/strings.xml

@@ -265,15 +265,8 @@
 
     <!-- Wallet -->
     <string name="balance">Balanç</string>
-    <string name="you_currently_have">Ara tens</string>
     <string name="convert_credits">Pots convertir els teus crèdits a USD i retirar la quantitat convertida emprant un intercanvi. &lt;a href=\"https://lbry.com/faq/exchanges\"&gt;Aprèn-ne més&lt;/a&gt;.</string>
     <string name="convert_credits_bittrex">&lt;a href=\"https://bittrex.com/Account/Register?referralCode=4M1-P30-BON\"&gt;Converteix crèdits a USD a Bittrex&lt;/a&gt;</string>
-    <string name="you_also_have">També tens</string>
-    <string name="you_staked">Has invertit</string>
-    <string name="in_tips">en propines</string>
-    <string name="in_your_publishes">en les teves publicacions</string>
-    <string name="in_your_supports">en els teus suports</string>
-    <string name="earn_more_tips">Obtén més propines pujant vídeos genials</string>
     <string name="sdk_initializing">El servei en segon pla s\'està inicialitzant...</string>
     <string name="sdk_still_initializing">El servei en segon pla encara s\'està inicialitzant. Pots explorar i veure contingut mentrestant.</string>
     <string name="sdk_initializing_functionality">No pots fer això ara perquè el servei en segon pla encara s\'està inicialitzant.</string>

app/src/main/res/values-de/strings.xml

@@ -256,15 +256,8 @@ Bitte versuche es später erneut.</string>
 
     <!-- Wallet -->
     <string name="balance">Kontostand</string>
-    <string name="you_currently_have">Sie haben derzeit</string>
     <string name="convert_credits">Sie können Ihr Guthaben in USD umrechnen und den umgerechneten Betrag über einen Umtausch abheben. &lt;a href=\"https://lbry.com/faq/exchanges\"&gt;Learn more&lt;/a&gt;.</string>
     <string name="convert_credits_bittrex">&lt;a href=\"https://bittrex.com/Account/Register?referralCode=4M1-P30-BON\"&gt;Convert credits to USD on Bittrex&lt;/a&gt;</string>
-    <string name="you_also_have">Sie haben auch</string>
-    <string name="you_staked">Sie haben gesteckt</string>
-    <string name="in_tips">in Trinkgeldern</string>
-    <string name="in_your_publishes">in Deinen Veröffentlichungen</string>
-    <string name="in_your_supports">in Deinen Unterstützungen</string>
-    <string name="earn_more_tips">Verdienen Sie weitere Tipps, indem Sie coole Videos hochladen</string>
     <string name="sdk_still_initializing">Der Hintergrunddienst wird noch initialisiert. In der Zwischenzeit können Sie Inhalte erkunden und ansehen.</string>
     <string name="sdk_initializing_functionality">Sie können dies derzeit nicht tun, da der Hintergrunddienst noch initialisiert wird.</string>
 

app/src/main/res/values-es/strings.xml

@@ -265,15 +265,8 @@
 
     <!-- Wallet -->
     <string name="balance">Saldo</string>
-    <string name="you_currently_have">Tu Actualmente tienes</string>
     <string name="convert_credits">Puede convertir sus créditos a USD y retirar el monto convertido mediante un intercambio. &lt;a href=\"https://lbry.com/faq/exchanges\"&gt;Aprender más&lt;/a&gt;.</string>
     <string name="convert_credits_bittrex">&lt;a href=\"https://bittrex.com/Account/Register?referralCode=4M1-P30-BON\"&gt;Convierta créditos a USD en Bittrex&lt;/a&gt;</string>
-    <string name="you_also_have">También tienes</string>
-    <string name="you_staked">En stake</string>
-    <string name="in_tips">en propinas </string>
-    <string name="in_your_publishes">en tus publicaciones</string>
-    <string name="in_your_supports">en tus propinas</string>
-    <string name="earn_more_tips">Obtenga más propinas al subir videos geniales</string>
     <string name="sdk_initializing">El servicio en segundo plano se está iniciando...</string>
     <string name="sdk_still_initializing">El servicio en segundo plano aún se está iniciando. Puede explorar y ver contenido mientras tanto.</string>
     <string name="sdk_initializing_functionality">No puede hacer esto ahora porque el servicio en segundo plano todavía no está iniciado.</string>

app/src/main/res/values-et/strings.xml

@@ -221,15 +221,8 @@
 
     <!-- Wallet -->
     <string name="balance">Saldo</string>
-    <string name="you_currently_have">Hetkel on sul</string>
     <string name="convert_credits">Valuutavahetustes saad vahetada oma LBC raha USD vastu ja selle välja võtta. &lt;a href=\"https://lbry.com/faq/exchanges\"&gt;Loe lisa&lt;/a&gt;.</string>
     <string name="convert_credits_bittrex">&lt;a href=\"https://bittrex.com/Account/Register?referralCode=4M1-P30-BON\"&gt;Valuutavahetus Bittrex LBC > USD&lt;/a&gt;</string>
-    <string name="you_also_have">Lisaks on sul</string>
-    <string name="you_staked">Sul on panused</string>
-    <string name="in_tips">jootrahana</string>
-    <string name="in_your_publishes">sinu postitustes</string>
-    <string name="in_your_supports">sinu toetustes</string>
-    <string name="earn_more_tips">Teeni lisapreemiaid laadides üles huvitavaid videosid</string>
     <string name="sdk_still_initializing">Taustateenus veel stardib. Võid seniks postitusi sirvida.</string>
     <string name="sdk_initializing_functionality">Seda ei saa hetkel teha, kuna taustateenus pole veel käivitunud.</string>
 

app/src/main/res/values-fr/strings.xml

@@ -265,15 +265,8 @@
 
     <!-- Wallet -->
     <string name="balance">Solde</string>
-    <string name="you_currently_have">Vous avez actuellement</string>
     <string name="convert_credits">Vous pouvez convertir vos crédits en USD et retirer le montant converti à l\'aide d\'un échange. &lt;a href=\"https://lbry.com/faq/exchanges\"&gt;Learn more&lt;/a&gt;.</string>
     <string name="convert_credits_bittrex">&lt;a href=\"https://bittrex.com/Account/Register?referralCode=4M1-P30-BON\"&gt;Convert credits to USD on Bittrex&lt;/a&gt;</string>
-    <string name="you_also_have">Vous avez aussi</string>
-    <string name="you_staked">Tu as jalonné</string>
-    <string name="in_tips">En pourboires</string>
-    <string name="in_your_publishes">dans vos publications</string>
-    <string name="in_your_supports">dans vos supports</string>
-    <string name="earn_more_tips">Obtenez plus de pourboire en téléchargeant des vidéos sympas</string>
     <string name="sdk_initializing">Le service d\'arrière-plan est en cours d\'initialisation…</string>
     <string name="sdk_still_initializing">Le service d\'arrière-plan est toujours en cours d\'initialisation. Vous pouvez explorer et regarder du contenu en attendant.</string>
     <string name="sdk_initializing_functionality">Vous ne pouvez pas le faire pour le moment car le service d\'arrière-plan est toujours en cours d\'initialisation.</string>

app/src/main/res/values-gu/strings.xml

@@ -252,15 +252,8 @@
 
     <!-- Wallet -->
     <string name="balance">બેલેન્સ</string>
-    <string name="you_currently_have">તમારી પાસે હાલમાં</string>
     <string name="convert_credits">તમે તમારા ક્રેડિટને USD માં કન્વર્ટ કરી શકો છો અને એક્સચેંજનો ઉપયોગ કરીને રૂપાંતરિત રકમ પાછા ખેંચી શકો છો. &lt;a href=\"https://lbry.com/faq/exchanges\"&gt;Learn more&lt;/a&gt;.</string>
     <string name="convert_credits_bittrex">&lt;a href=\"https://bittrex.com/Account/Register?referralCode=4M1-P30-BON\"&gt;Convert credits to USD on Bittrex&lt;/a&gt;</string>
-    <string name="you_also_have">તમારી પાસે પણ છે</string>
-    <string name="you_staked">તમે સ્ટેક્ડ</string>
-    <string name="in_tips">ટીપ્સમાં</string>
-    <string name="in_your_publishes">તમારા પ્રકાશનોમાં</string>
-    <string name="in_your_supports">તમારા સપોર્ટ</string>
-    <string name="earn_more_tips">કૂલ વિડિઓઝ અપલોડ કરીને વધુ ટીપ્સ કમાઓ</string>
     <string name="sdk_still_initializing">પૃષ્ઠભૂમિ સેવા હજી પ્રારંભ થઈ રહી છે. તમે સરેરાશ સમયમાં અન્વેષણ કરી શકો છો અને સામગ્રી જોઈ શકો છો.</string>
     <string name="sdk_initializing_functionality">તમે હમણાં આ કરી શકતા નથી કારણ કે પૃષ્ઠભૂમિ સેવા હજી પ્રારંભ થઈ રહી છે.</string>
 

app/src/main/res/values-he/strings.xml

@@ -281,15 +281,8 @@
 
     <!-- Wallet -->
     <string name="balance">מאזן</string>
-    <string name="you_currently_have">יש לך כרגע</string>
     <string name="convert_credits">ביכולתך להמיר את הקרדיט שלך ל-USD ולמשוך את הסכום המומר באמצעות חלפניה. &lt;a href=\"https://lbry.com/faq/exchanges\"&gt;למדו עוד&lt;/a&gt;.</string>
     <string name="convert_credits_bittrex">&lt;a href=\"https://bittrex.com/Account/Register?referralCode=4M1-P30-BON\"&gt;המר קרדיט ל-USD באתר Bittrex&lt;/a&gt;</string>
-    <string name="you_also_have">יש לך גם</string>
-    <string name="you_staked">השקעת</string>
-    <string name="in_tips">בטיפים</string>
-    <string name="in_your_publishes">בפרסומים שלך</string>
-    <string name="in_your_supports">בפעולות תמיכה</string>
-    <string name="earn_more_tips">הרווח יותר טיפים ע\"י העלאת סרטונים מגניבים</string>
     <string name="sdk_initializing">תהליך הרקע כרגע מתאתחל…</string>
     <string name="sdk_still_initializing">תהליך הרקע כרגע מתאתחל. אתה יכול לבצע סקירה ולצפות בתכנים בינתיים.</string>
     <string name="sdk_initializing_functionality">אינך יכול לבצע זאת בינתיים משום שתהליך הרקע עדיין מתאתחל.</string>

app/src/main/res/values-hi/strings.xml

@@ -265,15 +265,8 @@
 
     <!-- Wallet -->
     <string name="balance">बैलेंस</string>
-    <string name="you_currently_have">आपके पास अभी है</string>
     <string name="convert_credits"> आप अपने क्रेडिटस को यूसडी में बदल सकते हैं और उन्हें एक्सचेंज की मदद से निकाल भी सकते हैं। &lt;a href=\"https://lbry.com/faq/exchanges\"&gt;Learn more&lt;/a&gt;.</string>
     <string name="convert_credits_bittrex">&lt;a href=\"https://bittrex.com/Account/Register?referralCode=4M1-P30-BON\"&gt; क्रेडिटस को यूसडी में बदलें बिट्रिक्स पर&lt;/a&gt;</string>
-    <string name="you_also_have">  आपके पास और भी है</string>
-    <string name="you_staked">आपने स्टेक की है</string>
-    <string name="in_tips">टिप्स में</string>
-    <string name="in_your_publishes">आपकी पब्लिशिस में हैं</string>
-    <string name="in_your_supports">आपके सपोर्ट्स में हैं</string>
-    <string name="earn_more_tips">मनोरंजक वीडियोस अपलोड करके और अधिक टिप्स कमाए</string>
     <string name="sdk_initializing">पृष्ठभूमि सेवा प्रारंभ कर रहा है ...</string>
     <string name="sdk_still_initializing">पृष्ठभूमि सेवाएं अभी भी शुरू हो रही है। इस दौरान आप अन्य सामग्री को खोज एवं देख सकते हैं।</string>
     <string name="sdk_initializing_functionality">आप यह अभी नहीं कर सकते हैं क्योंकि पृष्ठभूमि सेवाएं अभी भी शुरू हो रही है</string>

app/src/main/res/values-id/strings.xml

@@ -257,15 +257,8 @@
 
     <!-- Wallet -->
     <string name="balance">Saldo</string>
-    <string name="you_currently_have">Anda sekarang punya</string>
     <string name="convert_credits">Anda dapat mengonversi kredit Anda ke USD dan menarik jumlah yang dikonversi menggunakan pertukaran. &lt;a href=\"https://lbry.com/faq/exchanges\"&gt;Learn more&lt;/a&gt;.</string>
     <string name="convert_credits_bittrex">&lt;a href=\"https://bittrex.com/Account/Register?referralCode=4M1-P30-BON\"&gt;Convert credits to USD on Bittrex&lt;/a&gt;</string>
-    <string name="you_also_have">Kamu juga punya</string>
-    <string name="you_staked">Anda mempertaruhkan</string>
-    <string name="in_tips">dalam tips</string>
-    <string name="in_your_publishes">di publikasi Anda</string>
-    <string name="in_your_supports">dalam dukungan Anda</string>
-    <string name="earn_more_tips">Hasilkan lebih banyak tips dengan mengunggah video keren</string>
     <string name="sdk_initializing">Layanan latar belakang sedang menginisialisasi...</string>
     <string name="sdk_still_initializing">Layanan latar belakang masih diinisialisasi. Anda dapat menjelajahi dan menonton konten dalam waktu yang bersamaan.</string>
     <string name="sdk_initializing_functionality">Anda tidak dapat melakukan ini sekarang karena layanan latar belakang masih diinisialisasi.</string>

app/src/main/res/values-it/strings.xml

@@ -265,15 +265,8 @@
 
     <!-- Wallet -->
     <string name="balance">Saldo</string>
-    <string name="you_currently_have">Hai attualmente</string>
     <string name="convert_credits">Puoi convertire i tuoi crediti in USD e trasferire il valore convertito utilizzando un cambio. &lt;a href=\"https://lbry.com/faq/exchanges\"&gt;Vedi altro&lt;/a&gt;.</string>
     <string name="convert_credits_bittrex">&lt;a href=\"https://bittrex.com/Account/Register?referralCode=4M1-P30-BON\"&gt;Converti crediti in USD su Bittrex&lt;/a&gt;</string>
-    <string name="you_also_have">Hai anche</string>
-    <string name="you_staked">Hai accumulato</string>
-    <string name="in_tips">in donaziones</string>
-    <string name="in_your_publishes">nelle tue pubblicazioni</string>
-    <string name="in_your_supports">nei tuoi supporti</string>
-    <string name="earn_more_tips">Guadagna altre donazioni caricando video interessanti</string>
     <string name="sdk_initializing">Avvio servizio in background...</string>
     <string name="sdk_still_initializing">Il servizio in background è ancora in avvio. Puoi esplorare e visualizzare contenuti nel frattempo.</string>
     <string name="sdk_initializing_functionality">Non puoi fare questo al momento perché il servizio in background è ancora in avviamento.</string>

app/src/main/res/values-jv/strings.xml

@@ -257,15 +257,8 @@
 
     <!-- Wallet -->
     <string name="balance">Duwitmu</string>
-    <string name="you_currently_have">Sampeyan saiki duwe</string>
     <string name="convert_credits">Sampeyan bisa ngowahi kridit sampeyan menyang USD lan mbatalake jumlah sing diowahi nggunakake ijol-ijolan. &lt;a href=\"https://lbry.com/faq/exchanges\"&gt;Learn more&lt;/a&gt;.</string>
     <string name="convert_credits_bittrex">&lt;a href=\"https://bittrex.com/Account/Register?referralCode=4M1-P30-BON\"&gt;Convert credits to USD on Bittrex&lt;/a&gt;</string>
-    <string name="you_also_have">Sampeyan yo duwe</string>
-    <string name="you_staked">Sampeyan naruhno</string>
-    <string name="in_tips">ing tips</string>
-    <string name="in_your_publishes">ing nerbitake sampeyan</string>
-    <string name="in_your_supports">ing dhukungan sampeyan</string>
-    <string name="earn_more_tips">Entuk tips liyane kanthi ngunggah video sing viral</string>
     <string name="sdk_initializing">Miwiti Layanan latar mburi...</string>
     <string name="sdk_still_initializing">Layanan latar mburi isih miwiti. Sampeyan bisa njelajah lan nonton konten ing wektu tegese.</string>
     <string name="sdk_initializing_functionality">Sampeyan ora bisa nindakake iki saiki amarga layanan latar mburi isih miwiti.</string>

app/src/main/res/values-ms/strings.xml

@@ -258,15 +258,8 @@ Sila kembali sebentar lagi.</string>
 
     <!-- Wallet -->
     <string name="balance">Baki</string>
-    <string name="you_currently_have">Anda kini mempunyai</string>
     <string name="convert_credits">Anda boleh menukar kredit anda ke USD dan keluarkan jumlah tersebut menerusi sebuah bursa. &lt;a href=\"https://lbry.com/faq/exchanges\"&gt;Learn more&lt;/a&gt;.</string>
     <string name="convert_credits_bittrex">&lt;a href=\"https://bittrex.com/Account/Register?referralCode=4M1-P30-BON\"&gt;Tukar kredit ke USD dengan Bittrex&lt;/a&gt;</string>
-    <string name="you_also_have">Anda juga mempunyai</string>
-    <string name="you_staked">Anda mempertaruhkan</string>
-    <string name="in_tips">dalam tips</string>
-    <string name="in_your_publishes">dalam terbitan anda</string>
-    <string name="in_your_supports">dalam sokongan anda</string>
-    <string name="earn_more_tips">Dapatkan lebih banyak tips dengan memuat-naik video yang menarik</string>
     <string name="sdk_initializing">Servis latar belakang sedang diinisialisasi...</string>
     <string name="sdk_still_initializing">Servis latar belakang masih diinisialisasi. Anda boleh meneroka dan menonton kandungan dalam masa yang sama.</string>
     <string name="sdk_initializing_functionality">Anda tidak dapat melakukan ini sekarang kerana servis latar belakang masih diinisialisasi.</string>

app/src/main/res/values-nl/strings.xml

@@ -252,15 +252,8 @@
 
     <!-- Wallet -->
     <string name="balance">Balans</string>
-    <string name="you_currently_have">U hebt momenteel</string>
     <string name="convert_credits">U kunt uw tegoeden omzetten in USD en het omgerekende bedrag opnemen met een omwisseling. &lt;a href=\"https://lbry.com/faq/exchanges\"&gt;Learn more&lt;/a&gt;.</string>
     <string name="convert_credits_bittrex">&lt;a href=\"https://bittrex.com/Account/Register?referralCode=4M1-P30-BON\"&gt;Convert credits to USD on Bittrex&lt;/a&gt;</string>
-    <string name="you_also_have">U hebt ook</string>
-    <string name="you_staked">U hebt ingezet</string>
-    <string name="in_tips">in fooien</string>
-    <string name="in_your_publishes">in uw publicaties</string>
-    <string name="in_your_supports">in uw steunen</string>
-    <string name="earn_more_tips">Verdien meer fooien door coole video\'s te uploaden</string>
     <string name="sdk_still_initializing">De achtergrondservice wordt nog geïnitialiseerd. U kunt ondertussen inhoud verkennen en bekijken.</string>
     <string name="sdk_initializing_functionality">U kunt dit nu niet doen omdat de achtergrondservice nog steeds wordt geïnitialiseerd.</string>
 

app/src/main/res/values-pl/strings.xml

@@ -281,15 +281,8 @@
 
     <!-- Wallet -->
     <string name="balance">Balans</string>
-    <string name="you_currently_have">Obecnie posiadasz</string>
     <string name="convert_credits">Możesz zamienić swoje kredyty na USD i wypłacić przeliczoną kwotę za pomocą giełdy. &lt;a href=\"https://lbry.com/faq/exchanges\"&gt;Learn more&lt;/a&gt;.</string>
     <string name="convert_credits_bittrex">&lt;a href=\"https://bittrex.com/Account/Register?referralCode=4M1-P30-BON\"&gt;Convert credits to USD on Bittrex&lt;/a&gt;</string>
-    <string name="you_also_have">Posiadasz również</string>
-    <string name="you_staked">Zestackowane</string>
-    <string name="in_tips">w napiwkach</string>
-    <string name="in_your_publishes">w twoich publikacjach</string>
-    <string name="in_your_supports">w twoich wsparciach</string>
-    <string name="earn_more_tips">Zarób więcej napiwków publikując fajne filmiki</string>
     <string name="sdk_initializing">Usługa w tle jest inicjowana...</string>
     <string name="sdk_still_initializing">Usługa w tle jest nadal inicjowana. W międzyczasie możesz eksplorować i oglądać treści.</string>
     <string name="sdk_initializing_functionality">Nie możesz tego teraz zrobić, ponieważ usługa w tle wciąż się inicjuje.</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -265,15 +265,8 @@
 
     <!-- Wallet -->
     <string name="balance">Saldo</string>
-    <string name="you_currently_have">Você tem atualmente</string>
     <string name="convert_credits">Você pode converter seus créditos em USD e retirar o valor convertido usando uma exchange. &lt;a href=\"https://lbry.com/faq/exchanges\"&gt;Saiba mais&lt;/a&gt;.</string>
     <string name="convert_credits_bittrex">&lt;a href=\"https://bittrex.com/Account/Register?referralCode=4M1-P30-BON\"&gt;Converter creditos para USD no Bittrex&lt;/a&gt;</string>
-    <string name="you_also_have">Você também tem</string>
-    <string name="you_staked">Você investiu</string>
-    <string name="in_tips">em gorjetas</string>
-    <string name="in_your_publishes">nas suas publicções</string>
-    <string name="in_your_supports">Nos seus apoios</string>
-    <string name="earn_more_tips">Ganhe mais gorjetas enviando vídeos legais</string>
     <string name="sdk_initializing">O serviço de segundo plano está sendo inicializado....</string>
     <string name="sdk_still_initializing">O serviço de segundo plano ainda está sendo inicializado. Você pode explorar conteúdos incríveis nesse meio tempo.</string>
     <string name="sdk_initializing_functionality">Você não pode fazer isso agora porque o serviço de segundo plano ainda está sendo inicializado.</string>

app/src/main/res/values-pt/strings.xml

@@ -265,15 +265,8 @@
 
     <!-- Wallet -->
     <string name="balance">Saldo</string>
-    <string name="you_currently_have">Atualmente você tem</string>
     <string name="convert_credits">Você pode converter seus créditos em dólares americanos e retirar o valor convertido usando uma exchange. &lt;a href=\"https://lbry.com/faq/exchanges\"&gt;Learn more&lt;/a&gt;.</string>
     <string name="convert_credits_bittrex">&lt;a href=\"https://bittrex.com/Account/Register?referralCode=4M1-P30-BON\"&gt;Convert credits to USD on Bittrex&lt;/a&gt;</string>
-    <string name="you_also_have">Você também tem</string>
-    <string name="you_staked">Você acumulou</string>
-    <string name="in_tips">em gorjetas</string>
-    <string name="in_your_publishes">nas suas publicações</string>
-    <string name="in_your_supports">nos seus apoios</string>
-    <string name="earn_more_tips">Ganhe mais gorjetas enviando videos legais</string>
     <string name="sdk_initializing">O serviço em segundo plano está inicializando...</string>
     <string name="sdk_still_initializing">O serviço em segundo plano ainda está sendo inicializado. Você pode explorar e assistir ao conteúdo nesse meio tempo.</string>
     <string name="sdk_initializing_functionality">Você não pode fazer isso agora porque o serviço em segundo plano ainda está sendo inicializado.</string>

app/src/main/res/values-ro/strings.xml

@@ -260,15 +260,8 @@
 
     <!-- Wallet -->
     <string name="balance">Sold</string>
-    <string name="you_currently_have">Acum ai</string>
     <string name="convert_credits">Îţi poţi converti creditele în USD şi să retragi suma folosind o casă de schimb. &lt;a href=\"https://lbry.com/faq/exchanges\"&gt;Detalii&lt;/a&gt;.</string>
     <string name="convert_credits_bittrex">&lt;a href=\"https://bittrex.com/Account/Register?referralCode=4M1-P30-BON\"&gt;Schimbă creditele în USD la Bittrex&lt;/a&gt;</string>
-    <string name="you_also_have">Mai ai și</string>
-    <string name="you_staked">Ai depus</string>
-    <string name="in_tips">în bacşişuri</string>
-    <string name="in_your_publishes">în publicările tale</string>
-    <string name="in_your_supports">în susţinerile tale</string>
-    <string name="earn_more_tips">Câştigă mai multe bacşişuri publicând conţinut</string>
     <string name="sdk_still_initializing">Serviciul din fundal încă se iniţializează. Poţi explora şi vedea conţinut între timp.</string>
     <string name="sdk_initializing_functionality">Nu poţi face asta acum deoarce serviciul din fundal încă se iniţializează.</string>
 

app/src/main/res/values-ru/strings.xml

@@ -281,15 +281,8 @@
 
     <!-- Wallet -->
     <string name="balance">Баланс</string>
-    <string name="you_currently_have">У Вас сейчас есть </string>
     <string name="convert_credits">Вы можете поменять кредиты на доллары США и снять сумму, используя обменник. &lt;a href=\"https://lbry.com/faq/exchanges\"&gt;Learn more&lt;/a&gt;.</string>
     <string name="convert_credits_bittrex">&lt;a href=\"https://bittrex.com/Account/Register?referralCode=4M1-P30-BON\"&gt;Convert credits to USD on Bittrex&lt;/a&gt;</string>
-    <string name="you_also_have">У Вас также есть</string>
-    <string name="you_staked">У Вас сохранено</string>
-    <string name="in_tips">в чаевых</string>
-    <string name="in_your_publishes">в Ваших публикациях</string>
-    <string name="in_your_supports">в Ваших поддержках</string>
-    <string name="earn_more_tips">Заработайте больше чаевых, загружая крутые видео</string>
     <string name="sdk_initializing">Фоновый сервис запускается...</string>
     <string name="sdk_still_initializing">Фоновый сервис всё ещё запускается. Между тем Вы уже можете искать и смотреть какой-либо контент.</string>
     <string name="sdk_initializing_functionality">Вы не можете сделать это прямо сейчас, потому что фоновый сервис всё ещё запускается.</string>

app/src/main/res/values-sr/strings.xml

@@ -273,15 +273,8 @@
 
     <!-- Wallet -->
     <string name="balance">Balans</string>
-    <string name="you_currently_have">Trenutno imate</string>
     <string name="convert_credits">Možete konvertovati vaše kredite u USD i unovčiti konvertovani iznos koristeći menjačnicu. &lt;a href=\"https://lbry.com/faq/exchanges\"&gt;Learn more&lt;/a&gt;.</string>
     <string name="convert_credits_bittrex">&lt;a href=\"https://bittrex.com/Account/Register?referralCode=4M1-P30-BON\"&gt;Convert credits to USD on Bittrex&lt;/a&gt;</string>
-    <string name="you_also_have">Takođje imate</string>
-    <string name="you_staked">Vi štedite</string>
-    <string name="in_tips">u tipovima</string>
-    <string name="in_your_publishes">u vašim objavama</string>
-    <string name="in_your_supports">u vašim podrškama</string>
-    <string name="earn_more_tips">Zaradi više tipova tako što ćeš objaviti  što više cool video klipova</string>
     <string name="sdk_initializing">Pozadinski servis se pokreće...</string>
     <string name="sdk_still_initializing">Pokretanje pozadinskog servisa je i dalje u toku. Za to vreme možete istraživati i gledati sadržaje.</string>
     <string name="sdk_initializing_functionality">Ne možete uraditi ovo za vreme učitavanja pozadinskog servisa.</string>

app/src/main/res/values-tr/strings.xml

@@ -252,15 +252,8 @@
 
     <!-- Wallet -->
     <string name="balance">Bakiye</string>
-    <string name="you_currently_have">Şuna sahipsiniz</string>
     <string name="convert_credits">Kredilerinizi USD\'ye çevirebilir ve döviz hizmeti ile paranızı çekebilirsiniz. &lt;a href=\"https://lbry.com/faq/exchanges\"&gt;Learn more&lt;/a&gt;.</string>
     <string name="convert_credits_bittrex">&lt;a href=\"https://bittrex.com/Account/Register?referralCode=4M1-P30-BON\"&gt;Convert credits to USD on Bittrex&lt;/a&gt;</string>
-    <string name="you_also_have">Şunlara da sahipsiniz</string>
-    <string name="you_staked">Ayırdığınız miktar</string>
-    <string name="in_tips">bahşiş olarak</string>
-    <string name="in_your_publishes">yayınlarınızda mevcut olan</string>
-    <string name="in_your_supports">desteklerinizde mevcut olan</string>
-    <string name="earn_more_tips">Daha havalı videolar yükleyerek daha çok bahşiş kazan</string>
     <string name="sdk_still_initializing">Arkaplan servisi hala başlatılıyor. Bu arada siz içerikleri keşfedebilir ve izleyebilirsiniz.</string>
     <string name="sdk_initializing_functionality">Bunu şu an yapamazsınız çünkü arkaplan servisi hala başlatılıyor.</string>
 

app/src/main/res/values-uk/strings.xml

@@ -268,15 +268,8 @@
 
     <!-- Wallet -->
     <string name="balance">Рахунок </string>
-    <string name="you_currently_have">У Вас зараз є</string>
     <string name="convert_credits">Ви можете обміняти кредити на долари США та зняти ці гроші за допомогою обміннику. &lt;a href=\"https://lbry.com/faq/exchanges\"&gt;Learn more&lt;/a&gt;.</string>
     <string name="convert_credits_bittrex">&lt;a href=\"https://bittrex.com/Account/Register?referralCode=4M1-P30-BON\"&gt;Convert credits to USD on Bittrex&lt;/a&gt;</string>
-    <string name="you_also_have">У Вас також є</string>
-    <string name="you_staked">Ви стейкнули </string>
-    <string name="in_tips">в чайових</string>
-    <string name="in_your_publishes">у Ваших публікаціях</string>
-    <string name="in_your_supports">у Ваших підтримках</string>
-    <string name="earn_more_tips">Заробляйте більше чайових, завантажуючи класні відео</string>
     <string name="sdk_still_initializing">Фоновий сервіс все ще ініціалізується. Ви можете шукати та переглядати у цей час.</string>
     <string name="sdk_initializing_functionality">Ви не можете публікувати контент прямо зараз, тому що фоновий сервіс все ще ініціалізується.</string>
 

app/src/main/res/values-vi/strings.xml

@@ -245,15 +245,8 @@
 
     <!-- Wallet -->
     <string name="balance">Tài khoản</string>
-    <string name="you_currently_have">Bạn hiện có</string>
     <string name="convert_credits">Bạn có thể chuyển đổi tín dụng của mình sang USD và rút số tiền đã chuyển đổi bằng cách sử dụng một trao đổi.  &lt;a href=\"https://lbry.com/faq/exchanges\"&gt;Learn more&lt;/a&gt;.</string>
     <string name="convert_credits_bittrex">&lt;a href=\"https://bittrex.com/Account/Register?referralCode=4M1-P30-BON\"&gt;Đổi LBC sang USD tại Bittrex&lt;/a&gt;</string>
-    <string name="you_also_have">Bạn cũng có</string>
-    <string name="you_staked">Bạn đặt cược</string>
-    <string name="in_tips">in tips</string>
-    <string name="in_your_publishes">trong nội dung của bạn</string>
-    <string name="in_your_supports">trong sự hỗ trợ của bạn</string>
-    <string name="earn_more_tips">Kiếm thêm tiền bằng cách tải lên các video thú vị</string>
     <string name="sdk_still_initializing">Dịch vụ nền vẫn đang khởi tạo. Bạn có thể khám phá và xem nội dung trong thời gian trung bình.</string>
     <string name="sdk_initializing_functionality">Bạn không thể làm điều này ngay bây giờ vì dịch vụ nền vẫn đang khởi tạo.</string>
 

app/src/main/res/values-zh-rTW/strings.xml

@@ -257,15 +257,8 @@
 
     <!-- Wallet -->
     <string name="balance">餘額</string>
-    <string name="you_currently_have">你目前有</string>
     <string name="convert_credits">你可以把信用額兌換為美元然後到交易所提取。&lt;a href=\"https://lbry.com/faq/exchanges\"&gt;了解更多&lt;/a&gt;。</string>
     <string name="convert_credits_bittrex">&lt;a href=\"https://bittrex.com/Account/Register?referralCode=4M1-P30-BON\"&gt;在Bittrex上轉換美元&lt;/a&gt;</string>
-    <string name="you_also_have">你同時有</string>
-    <string name="you_staked">你累計</string>
-    <string name="in_tips">於小費</string>
-    <string name="in_your_publishes">為發佈押金</string>
-    <string name="in_your_supports">你支持的內容</string>
-    <string name="earn_more_tips">上傳酷酷的影片以獲得更多小費</string>
     <string name="sdk_initializing">背景程式執行初始化中……</string>
     <string name="sdk_still_initializing">背景程式仍在初始化。與此同時，你可以探索和觀看內容。</string>
     <string name="sdk_initializing_functionality">你目前還不能執行這動作，因為背景程式仍在初始化。</string>

app/src/main/res/values/attrs.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="CreditsBalanceView">
+        <attr name="textSize" format="dimension" />
+        <attr name="iconSize" format="dimension" />
+        <attr name="amount" format="string" />
+    </declare-styleable>
+</resources>

app/src/main/res/values/dimens.xml

@@ -5,4 +5,7 @@
     <dimen name="nav_header_vertical_spacing">8dp</dimen>
     <dimen name="nav_header_height">176dp</dimen>
     <dimen name="fab_margin">16dp</dimen>
+    <dimen name="wallet_total_balance_font_size">14sp</dimen>
+    <dimen name="wallet_detail_balance_font_size">12sp</dimen>
+    <dimen name="wallet_detail_balance_desc_font_size">12sp</dimen>
 </resources>

app/src/main/res/values/strings.xml

@@ -277,15 +277,19 @@
 
     <!-- Wallet -->
     <string name="balance">Balance</string>
-    <string name="you_currently_have">You currently have</string>
+    <string name="your_total_balance">Your total balance.</string>
+    <string name="all_of_this_is_yours">Your total balance. All of this is yours, but some credits are in use on channels and content right now.</string>
     <string name="convert_credits">You can convert your credits to USD and withdraw the converted amount using an exchange. &lt;a href="https://lbry.com/faq/exchanges"&gt;Learn more&lt;/a&gt;.</string>
     <string name="convert_credits_bittrex">&lt;a href="https://bittrex.com/Account/Register?referralCode=4M1-P30-BON"&gt;Convert credits to USD on Bittrex&lt;/a&gt;</string>
-    <string name="you_also_have">You also have</string>
+    <string name="immediately_spendable">immediately spendable</string>
-    <string name="you_staked">You staked</string>
+    <string name="boosting_content">boosting content</string>
-    <string name="in_tips">in tips</string>
+    <string name="view_more">View more</string>
-    <string name="in_your_publishes">in your publishes</string>
+    <string name="earned_from_others">…earned from others</string>
-    <string name="in_your_supports">in your supports</string>
+    <string name="on_initial_publishes">…on initial publishes</string>
-    <string name="earn_more_tips">Earn more tips by uploading cool videos</string>
+    <string name="supporting_content">…supporting content</string>
+    <string name="unlock_to_spend">(Unlock to spend)</string>
+    <string name="delete_or_edit_past_content">(Delete or edit past content to spend)</string>
+    <string name="delete_supports_to_spend">(Delete supports to spend)</string>
     <string name="sdk_initializing">The background service is initializing…</string>
     <string name="sdk_still_initializing">The background service is still initializing. You can explore and watch content in the mean time.</string>
     <string name="sdk_initializing_functionality">You cannot do this right now because the background service is still initializing.</string>
@@ -452,6 +456,9 @@
     <string name="twitter_verification">Twitter Verification</string>
     <string name="twitter_verification_desc">Get instantly verified using your Twitter account. Your Twitter email address must match the email that you provided and your account should be active.</string>
     <string name="twitter_verify">Verify with Twitter</string>
+    <string name="phone_number_verification">Phone Number Verification</string>
+    <string name="phone_number_verification_desc">Get instantly verified using your phone number.</string>
+    <string name="phone_number_verify">Verify with phone number</string>
     <string name="skip_queue_verification">Skip the Queue</string>
     <string name="skip_queue_verification_desc">Skip the manual verification queue by paying a fee in order to start participating in the rewards program immediately.</string>
     <string name="skip_queue_manual_check">If you previously completed a purchase successfully and you still see this screen, please tap the verify purchase button below.</string>