diff --git a/packages/yoroi-extension/app/Routes.js b/packages/yoroi-extension/app/Routes.js
index 9ce82dcbbf..d3cdf1b58e 100644
--- a/packages/yoroi-extension/app/Routes.js
+++ b/packages/yoroi-extension/app/Routes.js
@@ -75,8 +75,6 @@ const WalletSettingsPagePromise = () => import('./containers/settings/categories
 const WalletSettingsPage = React.lazy(WalletSettingsPagePromise);
 const ExternalStorageSettingsPagePromise = () => import('./containers/settings/categories/ExternalStorageSettingsPage');
 const ExternalStorageSettingsPage = React.lazy(ExternalStorageSettingsPagePromise);
-const OAuthDropboxPagePromise = () => import('./containers/settings/categories/OAuthDropboxPage');
-const OAuthDropboxPage = React.lazy(OAuthDropboxPagePromise);
 const TermsOfUseSettingsPagePromise = () => import('./containers/settings/categories/TermsOfUseSettingsPage');
 const TermsOfUseSettingsPage = React.lazy(TermsOfUseSettingsPagePromise);
 const SupportSettingsPagePromise = () => import('./containers/settings/categories/SupportSettingsPage');
@@ -87,9 +85,6 @@ const AnalyticsSettingsPage = React.lazy(AnalyticsSettingsPagePromise);
 const NightlyPagePromise = () => import('./containers/profile/NightlyPage');
 const NightlyPage = React.lazy(NightlyPagePromise);
 
-const MyWalletsPagePromise = () => import('./containers/wallet/MyWalletsPage');
-const MyWalletsPage = React.lazy(MyWalletsPagePromise);
-
 const WalletSummaryPagePromise = () => import('./containers/wallet/WalletSummaryPage');
 const WalletSummaryPage = React.lazy(WalletSummaryPagePromise);
 
@@ -132,6 +127,9 @@ const TokensPageRevamp = React.lazy(TokensPageRevampPromise);
 const TokensDetailPageRevampPromise = () => import('./containers/wallet/TokenDetailPageRevamp');
 const TokensDetailPageRevamp = React.lazy(TokensDetailPageRevampPromise);
 
+const CashbackPagePromise = () => import('./containers/cashback/CashbackPage');
+const CashbackPage = React.lazy(CashbackPagePromise)
+
 const NFTsPageRevampPromise = () => import('./containers/wallet/NFTsPageRevamp');
 const NFTsPageRevamp = React.lazy(NFTsPageRevampPromise);
 
@@ -157,11 +155,9 @@ export const LazyLoadPromises: Array<() => any> = [
   GeneralSettingsPagePromise,
   WalletSettingsPagePromise,
   ExternalStorageSettingsPagePromise,
-  OAuthDropboxPagePromise,
   TermsOfUseSettingsPagePromise,
   SupportSettingsPagePromise,
   NightlyPagePromise,
-  MyWalletsPagePromise,
   WalletSummaryPagePromise,
   WalletSendPagePromise,
   WalletAssetsPagePromise,
@@ -216,10 +212,13 @@ export const Routes = (stores: StoresMap): Node => {
             path={ROUTES.PROFILE.OPT_FOR_ANALYTICS}
             component={props => <OptForAnalyticsPage {...props} stores={stores} />}
           />
-          <Route exact path={ROUTES.MY_WALLETS} component={props => <MyWalletsPage {...props} stores={stores} />} />
           <Route exact path={ROUTES.STAKING} component={props => <StakingPage {...props} stores={stores} />} />
           <Route path={ROUTES.ASSETS.ROOT} component={props => wrapAssets({ ...props, stores }, AssetsSubpages(stores))} />
           <Route path={ROUTES.NFTS.ROOT} component={props => wrapNFTs({ ...props, stores }, NFTsSubPages(stores))} />
+          <Route
+            path={ROUTES.CASHBACK.ROOT}
+            component={props => <CashbackPage {...props} stores={stores} />}
+          />
           <Route exact path={ROUTES.WALLETS.ADD} component={props => <AddWalletPage {...props} stores={stores} />} />
           <Route
             exact
@@ -241,11 +240,6 @@ export const Routes = (stores: StoresMap): Node => {
           <Route path={ROUTES.SWAP.ROOT} component={props => wrapSwap({ ...props, stores }, SwapSubpages(stores))} />
           <Route path={ROUTES.TRANSFER.ROOT} component={props => <Transfer {...props} stores={stores} />} />
           <Route exact path={ROUTES.SEND_FROM_URI.ROOT} component={props => <URILandingPage {...props} stores={stores} />} />
-          <Route
-            exact
-            path={ROUTES.OAUTH_FROM_EXTERNAL.DROPBOX}
-            component={props => <OAuthDropboxPage {...props} stores={stores} />}
-          />
           <Route exact path={ROUTES.SWITCH} component={props => <WalletSwitch {...props} stores={stores} />} />
           <Route exact path={ROUTES.REVAMP.CATALYST_VOTING} component={props => <VotingPage {...props} stores={stores} />} />
           <Route exact path={ROUTES.EXCHANGE_END} component={props => <ExchangeEndPage {...props} stores={stores} />} />
@@ -259,8 +253,7 @@ export const Routes = (stores: StoresMap): Node => {
             path={ROUTES.PORTFOLIO.ROOT}
             component={() => PortfolioSubpages(stores)}
           />
-
-          <Redirect to={ROUTES.MY_WALLETS} />
+          <Redirect to={ROUTES.WALLETS.ROOT} />
         </Switch>
       </Suspense>
     </QueryClientProvider>
diff --git a/packages/yoroi-extension/app/UI/context/IntlProvider.tsx b/packages/yoroi-extension/app/UI/context/IntlProvider.tsx
index 76d0e5b1f0..105696d691 100644
--- a/packages/yoroi-extension/app/UI/context/IntlProvider.tsx
+++ b/packages/yoroi-extension/app/UI/context/IntlProvider.tsx
@@ -8,4 +8,4 @@ export const IntlProvider = ({ children, intl }: { children: React.ReactNode; in
 };
 
 export const useIntl = () =>
-  React.useContext(IntlProviderContext) ?? console.warn('IntlProviderontext: needs to be wrapped in a IntlProvider');
+  React.useContext(IntlProviderContext) ?? console.warn('IntlProviderContext: needs to be wrapped in a IntlProvider');
diff --git a/packages/yoroi-extension/app/api/ada/index.js b/packages/yoroi-extension/app/api/ada/index.js
index 30e293a58a..21a62fc39b 100644
--- a/packages/yoroi-extension/app/api/ada/index.js
+++ b/packages/yoroi-extension/app/api/ada/index.js
@@ -44,9 +44,10 @@ import {
   asGetSigningKey,
   asHasLevels,
   asHasUtxoChains,
+  asGetStakingKey,
 } from './lib/storage/models/PublicDeriver/traits';
 import { ConceptualWallet } from './lib/storage/models/ConceptualWallet/index';
-import type { IHasLevels } from './lib/storage/models/ConceptualWallet/interfaces';
+import { WalletTypeOption, type IHasLevels } from './lib/storage/models/ConceptualWallet/interfaces';
 import type {
   Address,
   Addressing,
@@ -165,6 +166,7 @@ import TimeUtils from './lib/storage/bridge/timeUtils';
 import type { IFetcher } from './lib/state-fetch/IFetcher.types';
 import { Bip44DerivationLevels, CoinType } from '@emurgo/yoroi-lib';
 import type { ProtocolParameters } from '@emurgo/yoroi-lib/dist/protocol-parameters/models';
+import { encryptWithPassword } from '../../utils/passwordCipher';
 
 // ADA specific Request / Response params
 
@@ -494,7 +496,6 @@ export type CreateHardwareWalletRequest = {|
   publicKey: string,
   ...Addressing,
   hwFeatures: HWFeatures,
-  checkAddressesInUse: FilterFunc,
   network: $ReadOnly<NetworkRow>,
 |};
 export type CreateHardwareWalletResponse = {|
@@ -1808,6 +1809,86 @@ export default class AdaApi {
     }
   }
 
+  async cloneWallet(
+    db: lf$Database,
+    publicDeriver: PublicDeriver<>,
+    network: $ReadOnly<NetworkRow>,
+  ): Promise<PublicDeriver<>> {
+    const withPublicKey = asGetPublicKey(publicDeriver);
+    if (!withPublicKey) {
+      throw new Error('unable to get public key');
+    }
+    const publicKey = await withPublicKey.getPublicKey();
+    const accountPublicKey = RustModule.WalletV4.Bip32PublicKey.from_hex(publicKey.Hash);
+
+    const conceptualWallet = publicDeriver.getParent();
+    const walletName = (await conceptualWallet.getFullConceptualWalletInfo()).Name;
+
+    let wallet;
+    if (conceptualWallet.getWalletType() === WalletTypeOption.HARDWARE_WALLET) {
+      const withStakingKey = asGetStakingKey(publicDeriver);
+      if (!withStakingKey) {
+        throw new Error('unable to get staking key');
+      }
+      const stakingKey = await withStakingKey.getStakingKey();
+
+      const hwMeta = conceptualWallet.getHwWalletMeta();
+      if (!hwMeta) {
+        throw new Error('unexpectedly missing hardware metadata');
+      }
+
+      wallet = await createHardwareCip1852Wallet({
+        db,
+        accountPublicKey,
+        accountIndex: stakingKey.addressing.path[2],
+        walletName,
+        accountName: '',
+        hwWalletMetaInsert: {
+          Vendor: hwMeta.Vendor,
+          Model: hwMeta.Model,
+          DeviceId: hwMeta.DeviceId,
+        },
+        network,
+      });
+    } else {
+      const withSigningKey = asGetSigningKey(publicDeriver);
+      if (!withSigningKey) {
+        throw new Error('unable to get signing key');
+      }
+      const signingKey = await withSigningKey.getSigningKey();
+      const encryptedRoot = signingKey.row.Hash;
+
+      const accountIndex = signingKey.path[3].Index;
+      if (accountIndex === null) {
+        throw new Error('missing account index');
+      }
+
+      wallet = await createStandardCip1852Wallet({
+        db,
+        encryptedRoot,
+        accountPublicKey,
+        accountIndex,
+        walletName,
+        accountName: '', // set account name empty now
+        network,
+      });
+    }
+  
+    const cip1852Wallet = await Cip1852Wallet.createCip1852Wallet(
+      db,
+      wallet.cip1852WrapperRow,
+    );
+
+    if (wallet.publicDeriver.length !== 1) {
+      throw new Error(`${nameof(AdaApi)}::${nameof(this.cloneWallet)} should only do 1 HW derivation at a time`);
+    }
+    const pubDeriverResult = wallet.publicDeriver[0].publicDeriverResult;
+    return await PublicDeriver.createPublicDeriver(
+      pubDeriverResult,
+      cip1852Wallet,
+    );
+  }
+
   /**
    * Creates wallet and saves result to DB
   */
@@ -1823,11 +1904,21 @@ export default class AdaApi {
     try {
       // Note: we only restore for 0th account
       const rootPk = generateWalletRootKey(recoveryPhrase);
+      const encryptedRoot = encryptWithPassword(
+        walletPassword,
+        rootPk.as_bytes(),
+      );
+      const accountPublicKey = rootPk
+        .derive(WalletTypePurpose.CIP1852)
+        .derive(CoinTypes.CARDANO)
+        .derive(request.accountIndex)
+        .to_public();
+
       const newPubDerivers = [];
       const wallet = await createStandardCip1852Wallet({
         db: request.db,
-        rootPk,
-        password: walletPassword,
+        encryptedRoot,
+        accountPublicKey,
         accountIndex: request.accountIndex,
         walletName,
         accountName: '', // set account name empty now
@@ -2694,11 +2785,13 @@ export async function encodeHardwareWalletSignResult(
   signatureHex: string,
   payloadHex: string,
   signingPublicKeyHex: string,
+  payloadHashed: boolean = false,
 ): Promise<{| signature: string, key: string |}> {
   const coseSign1 = await buildCoseSign1FromSignature (
     hexToBytes(addressHex),
     hexToBytes(signatureHex),
     hexToBytes(payloadHex),
+    payloadHashed,
   );
 
   const key = makeCip8Key(hexToBytes(signingPublicKeyHex));
diff --git a/packages/yoroi-extension/app/api/ada/lib/cardanoCrypto/utils.js b/packages/yoroi-extension/app/api/ada/lib/cardanoCrypto/utils.js
index b602dc350c..29e11fff60 100644
--- a/packages/yoroi-extension/app/api/ada/lib/cardanoCrypto/utils.js
+++ b/packages/yoroi-extension/app/api/ada/lib/cardanoCrypto/utils.js
@@ -178,6 +178,7 @@ export const buildCoseSign1FromSignature = async (
   address: Buffer,
   signature: Buffer,
   payload: Buffer,
+  payloadHashed: boolean = false,
 ): Promise<RustModule.MessageSigning.COSESign1> => {
   const protectedHeader = RustModule.MessageSigning.HeaderMap.new();
   protectedHeader.set_algorithm_id(
@@ -191,8 +192,19 @@ export const buildCoseSign1FromSignature = async (
   );
   const protectedSerialized = RustModule.MessageSigning.ProtectedHeaderMap.new(protectedHeader);
   const unprotected = RustModule.MessageSigning.HeaderMap.new();
+  if (payloadHashed) {
+    unprotected.set_header(
+      RustModule.MessageSigning.Label.new_text('hashed'),
+      RustModule.MessageSigning.CBORValue.new_special(
+        RustModule.MessageSigning.CBORSpecial.new_bool(true)
+      ),
+    );
+  }
   const headers = RustModule.MessageSigning.Headers.new(protectedSerialized, unprotected);
   const builder = RustModule.MessageSigning.COSESign1Builder.new(headers, payload, false);
+  if (payloadHashed) {
+    builder.hash_payload();
+  }
   return builder.build(signature);
 }
 
diff --git a/packages/yoroi-extension/app/api/ada/lib/storage/adaMigration.js b/packages/yoroi-extension/app/api/ada/lib/storage/adaMigration.js
index d7e6b98024..038da97853 100644
--- a/packages/yoroi-extension/app/api/ada/lib/storage/adaMigration.js
+++ b/packages/yoroi-extension/app/api/ada/lib/storage/adaMigration.js
@@ -21,7 +21,7 @@ import { migrateFromStorageV1 } from './bridge/walletBuilder/byron';
 import { RustModule } from '../cardanoCrypto/rustLoader';
 import { removeAllTransactions } from './bridge/updateTransactions';
 import { removePublicDeriver } from './bridge/walletBuilder/remove';
-import { asGetAllUtxos, asHasLevels, } from './models/PublicDeriver/traits';
+import { asGetAllUtxos, asHasLevels, asGetPublicKey, } from './models/PublicDeriver/traits';
 import { ConceptualWallet, isLedgerNanoWallet, } from './models/ConceptualWallet/index';
 import { loadWalletsFromStorage } from './models/load';
 import environment from '../../../../environment';
@@ -32,6 +32,7 @@ import { getAllSchemaTables, raii, } from './database/utils';
 import type { BlockRow } from './database/primitives/tables';
 import { GetBlock } from './database/primitives/api/read';
 import { ModifyUtxoAtSafePoint } from './database/utxo/api/write';
+import type { PublicDeriver } from './models/PublicDeriver/index';
 
 export async function migrateToLatest(
   localStorageApi: LocalStorageApi,
@@ -98,6 +99,7 @@ export async function migrateToLatest(
     ['<3.8.0', () => cardanoTxHistoryReset(persistentDb)],
     ['<4.18', () => populateNewUtxodata(persistentDb)],
     ['<5.4', () => unsetLegacyThemeFlags(localStorageApi)],
+    ['<5.5', () => migrateWalletOrderAndSelectedWalletForNetworkSwitch(persistentDb, localStorageApi)],
   ];
 
   let appliedMigration = false;
@@ -421,4 +423,43 @@ async function unsetLegacyThemeFlags(localStorageApi: LocalStorageApi): Promise<
   }
   await localStorageApi.unsetLegacyThemeFlags();
   return true;
-}
\ No newline at end of file
+}
+
+async function migrateWalletOrderAndSelectedWalletForNetworkSwitch(
+  db: lf$Database,
+  localStorageApi: LocalStorageApi,
+): Promise<boolean> {
+  const wallets = await loadWalletsFromStorage(db);
+
+  const oldWalletOrder = (await localStorageApi.getWalletsNavigation())?.cardano || [];
+  const publicKeyList = [];
+  for (const id of oldWalletOrder) {
+    const wallet = wallets.find(w => w.getPublicDeriverId() === id);
+    if (wallet) {
+      publicKeyList.push(await getPublicKey(wallet));
+    }
+  }
+  for (const wallet of wallets) {
+    if (!oldWalletOrder.includes(wallet.getPublicDeriverId())) {
+      publicKeyList.push(await getPublicKey(wallet));
+    }
+  }
+  await localStorageApi.saveWalletListOrder(publicKeyList);
+
+  const selectedWalletId = await localStorageApi.getSelectedWalletId();
+  const selectedWallet = wallets.find(
+    wallet => wallet.getPublicDeriverId() === selectedWalletId
+  );
+  if (selectedWallet) {
+    await localStorageApi.setSelectedWalletPublicKey(await getPublicKey(selectedWallet));
+  }
+  return true;
+}
+
+async function getPublicKey(publicDeriver: PublicDeriver<>): Promise<string> {
+  const withPubKey = asGetPublicKey(publicDeriver);
+  if (withPubKey == null) {
+    throw new Error('unexpected missing asGetPublicKey result');
+  }
+  return (await withPubKey.getPublicKey()).Hash;
+}
diff --git a/packages/yoroi-extension/app/api/ada/lib/storage/bridge/walletBuilder/byron.js b/packages/yoroi-extension/app/api/ada/lib/storage/bridge/walletBuilder/byron.js
index e166436923..6c06b4b270 100644
--- a/packages/yoroi-extension/app/api/ada/lib/storage/bridge/walletBuilder/byron.js
+++ b/packages/yoroi-extension/app/api/ada/lib/storage/bridge/walletBuilder/byron.js
@@ -217,7 +217,7 @@ export async function createStandardBip44Wallet(request: {|
           }
           return {
             deriverRequest: {
-              decryptPrivateDeriverPassword: request.password,
+              decryptPrivateDeriver: { preDerived: false, password: request.password },
               publicDeriverMeta: {
                 name: request.accountName,
               },
diff --git a/packages/yoroi-extension/app/api/ada/lib/storage/bridge/walletBuilder/shelley.js b/packages/yoroi-extension/app/api/ada/lib/storage/bridge/walletBuilder/shelley.js
index 6da1605320..f8c9cdb6ff 100644
--- a/packages/yoroi-extension/app/api/ada/lib/storage/bridge/walletBuilder/shelley.js
+++ b/packages/yoroi-extension/app/api/ada/lib/storage/bridge/walletBuilder/shelley.js
@@ -23,7 +23,6 @@ import type { HWFeatures, } from '../../database/walletTypes/core/tables';
 import { WalletBuilder } from './builder';
 
 import { RustModule } from '../../../cardanoCrypto/rustLoader';
-import { encryptWithPassword } from '../../../../../../utils/passwordCipher';
 
 import {
   Bip44DerivationLevels,
@@ -153,8 +152,8 @@ export async function getAccountDefaultDerivations(
 
 export async function createStandardCip1852Wallet(request: {|
   db: lf$Database,
-  rootPk: RustModule.WalletV4.Bip32PrivateKey,
-  password: string,
+  encryptedRoot: string,
+  accountPublicKey: RustModule.WalletV4.Bip32PublicKey,
   accountIndex: number,
   walletName: string,
   accountName: string,
@@ -164,24 +163,13 @@ export async function createStandardCip1852Wallet(request: {|
     throw new Error(`${nameof(createStandardCip1852Wallet)} needs hardened index`);
   }
 
-  const encryptedRoot = encryptWithPassword(
-    request.password,
-    request.rootPk.as_bytes(),
-  );
-
-  const accountPublicKey = request.rootPk
-    .derive(WalletTypePurpose.CIP1852)
-    .derive(CoinTypes.CARDANO)
-    .derive(request.accountIndex)
-    .to_public();
-
   if (request.network.BaseConfig[0].ChainNetworkId == null) {
     throw new Error(`${nameof(createStandardCip1852Wallet)} missing Byron network id`);
   }
 
   const initialDerivations = await getAccountDefaultDerivations(
     Number.parseInt(request.network.BaseConfig[0].ChainNetworkId, 10),
-    accountPublicKey,
+    request.accountPublicKey,
     rawGenAddByHash(new Set()),
   );
 
@@ -203,7 +191,7 @@ export async function createStandardCip1852Wallet(request: {|
         _finalState => ({
           rootInsert: {
             privateKeyInfo: {
-              Hash: encryptedRoot,
+              Hash: request.encryptedRoot,
               IsEncrypted: true,
               PasswordLastUpdate: null,
               Type: KeyKind.BIP32ED25519,
@@ -244,7 +232,10 @@ export async function createStandardCip1852Wallet(request: {|
           }
           return {
             deriverRequest: {
-              decryptPrivateDeriverPassword: request.password,
+              decryptPrivateDeriver: {
+                preDerived: true,
+                result: { pubKeyHex: request.accountPublicKey.to_hex() }
+              },
               publicDeriverMeta: {
                 name: request.accountName,
               },
diff --git a/packages/yoroi-extension/app/api/ada/lib/storage/models/ConceptualWallet/interfaces.js b/packages/yoroi-extension/app/api/ada/lib/storage/models/ConceptualWallet/interfaces.js
index c24351f6b3..23de72313c 100644
--- a/packages/yoroi-extension/app/api/ada/lib/storage/models/ConceptualWallet/interfaces.js
+++ b/packages/yoroi-extension/app/api/ada/lib/storage/models/ConceptualWallet/interfaces.js
@@ -75,13 +75,15 @@ export type IDerivePublicFromPrivateRequest = {|
   publicDeriverMeta: {|
     name: string,
   |},
-  decryptPrivateDeriverPassword: null | string,
-  /**
-   * void -> do not store key
-   * null -> store as unencrypted
-   * string  -> store and encrypt
-   */
-  encryptPublicDeriverPassword?: null | string,
+  decryptPrivateDeriver: {|
+    preDerived: false,
+    password: null | string
+  |} | {|
+    preDerived: true,
+    result: {|
+      pubKeyHex: string,
+    |},
+  |},
   initialDerivations: TreeInsert<any>,
   path: Array<{|
     index: number,
diff --git a/packages/yoroi-extension/app/api/ada/lib/storage/models/ConceptualWallet/traits.js b/packages/yoroi-extension/app/api/ada/lib/storage/models/ConceptualWallet/traits.js
index 899718810f..0588d2b8a7 100644
--- a/packages/yoroi-extension/app/api/ada/lib/storage/models/ConceptualWallet/traits.js
+++ b/packages/yoroi-extension/app/api/ada/lib/storage/models/ConceptualWallet/traits.js
@@ -39,8 +39,6 @@ import {
   Mixin,
 } from 'mixwith';
 
-import { encryptWithPassword } from '../../../../../../utils/passwordCipher';
-
 import {
   DerivePublicDeriverFromKey, AddAdhocPublicDeriver,
 } from '../../database/walletTypes/common/api/write';
@@ -56,7 +54,6 @@ import {
 import type {
   IChangePasswordRequest, IChangePasswordResponse,
 } from '../common/interfaces';
-import { hexToBytes } from '../../../../../../coreUtils';
 
 // ===========================
 //   DerivePublicFromPrivate
@@ -77,11 +74,14 @@ export async function derivePublicDeriver<Row>(
     {
       publicDeriverMeta: body.publicDeriverMeta,
       pathToPublic: privateKeyRow => {
-        const pubDeriverKey = normalizeToPubDeriverLevel({
-          privateKeyRow,
-          password: body.decryptPrivateDeriverPassword,
-          path: body.path.map(entry => entry.index),
-        });
+        const pubDeriverKey = body.decryptPrivateDeriver.preDerived ?
+          body.decryptPrivateDeriver.result :
+          normalizeToPubDeriverLevel({
+            privateKeyRow,
+            password: body.decryptPrivateDeriver.password,
+            path: body.path.map(entry => entry.index),
+          });
+          
         return [
           ...body.path.slice(0, body.path.length - 1).map(pathEntry => ({
             index: pathEntry.index,
@@ -98,19 +98,7 @@ export async function derivePublicDeriver<Row>(
               KeyDerivationId: insertRequest.keyDerivationId,
               ...body.path[body.path.length - 1].insert,
             }),
-            privateKey: body.encryptPublicDeriverPassword === undefined
-              ? null
-              : {
-                Hash: body.encryptPublicDeriverPassword === null
-                  ? pubDeriverKey.prvKeyHex
-                  : encryptWithPassword(
-                    body.encryptPublicDeriverPassword,
-                    hexToBytes(pubDeriverKey.prvKeyHex)
-                  ),
-                IsEncrypted: true,
-                PasswordLastUpdate: null,
-                Type: privateKeyRow.Type, // type doesn't change with derivations
-              },
+            privateKey: null,
             publicKey: {
               Hash: pubDeriverKey.pubKeyHex,
               IsEncrypted: false,
diff --git a/packages/yoroi-extension/app/api/ada/lib/storage/tests/index.test.js b/packages/yoroi-extension/app/api/ada/lib/storage/tests/index.test.js
index 39d5c3fba4..6343005a99 100644
--- a/packages/yoroi-extension/app/api/ada/lib/storage/tests/index.test.js
+++ b/packages/yoroi-extension/app/api/ada/lib/storage/tests/index.test.js
@@ -126,7 +126,7 @@ test('Can add and fetch address in wallet', async (done) => {
               insert: {},
             },
           ],
-          decryptPrivateDeriverPassword: privateDeriverPassword,
+          decryptPrivateDeriver: { preDerived: false, password: privateDeriverPassword },
           initialDerivations: [
             {
               index: 0, // external chain,
diff --git a/packages/yoroi-extension/app/api/ada/lib/test-config.forTests.js b/packages/yoroi-extension/app/api/ada/lib/test-config.forTests.js
index a32c7589f9..b1adda2090 100644
--- a/packages/yoroi-extension/app/api/ada/lib/test-config.forTests.js
+++ b/packages/yoroi-extension/app/api/ada/lib/test-config.forTests.js
@@ -21,6 +21,16 @@ const CONFIG: ConfigType = {
     pubKeyData: '',
     pubKeyMaster: '',
   },
+  bring: {
+    baseUrl: '',
+    identifier: '',
+    apiEndpoint: ''
+  },
+  bringSandbox: {
+    baseUrl: '',
+    identifier: '',
+    apiEndpoint: ''
+  },
 };
 
 global.CONFIG = CONFIG;
diff --git a/packages/yoroi-extension/app/api/localStorage/index.js b/packages/yoroi-extension/app/api/localStorage/index.js
index 0b27f0a342..10df67febb 100644
--- a/packages/yoroi-extension/app/api/localStorage/index.js
+++ b/packages/yoroi-extension/app/api/localStorage/index.js
@@ -27,15 +27,18 @@ const storageKeys = {
   COIN_PRICE_PUB_KEY_DATA: networkForLocalStorage + '-COIN-PRICE-PUB-KEY-DATA',
   EXTERNAL_STORAGE: networkForLocalStorage + '-EXTERNAL-STORAGE',
   TOGGLE_SIDEBAR: networkForLocalStorage + '-TOGGLE-SIDEBAR',
-  WALLETS_NAVIGATION: networkForLocalStorage + '-WALLETS-NAVIGATION',
   SUBMITTED_TRANSACTIONS: 'submittedTransactions',
   CATALYST_ROUND_INFO: networkForLocalStorage + '-CATALYST_ROUND_INFO',
   FLAGS: networkForLocalStorage + '-FLAGS',
   USER_THEME: networkForLocalStorage + '-USER-THEME',
   PORTFOLIO_FIAT_PAIR: networkForLocalStorage + '-PORTFOLIO_FIAT_PAIR',
+  BRING_SANDBOX: networkForLocalStorage + '-BRING_SANDBOX',
+  CURRENT_NETWORK_ID: networkForLocalStorage + '-CURRENT_NETWORK_ID',
+  WALLET_LIST_ORDER: networkForLocalStorage + '-WALLET_LIST_ORDER',
+  SELECTED_WALLET_PUBLIC_KEY: networkForLocalStorage + '_SELECTED_WALLET_PUBLIC_KEY',
+
   // ========== CONNECTOR   ========== //
   DAPP_CONNECTOR_WHITELIST: 'connector_whitelist',
-  SELECTED_WALLET: 'SELECTED_WALLET',
 
   IS_ANALYTICS_ALLOWED: networkForLocalStorage + '-IS_ANALYTICS_ALLOWED',
   ACCEPTED_TOS_VERSION: networkForLocalStorage + '-ACCEPTED_TOS_VERSION',
@@ -43,6 +46,11 @@ const storageKeys = {
   // ========== LEGACY USED FOR MIGRATIONS ========== //
   CUSTOM_THEME: networkForLocalStorage + '-CUSTOM-THEME',
   THEME: networkForLocalStorage + '-THEME',
+
+  CASHBACK_WALLET_ID: 'CASHBACK_WALLET_ID',
+  SHOWN_DISCLAIMERS: 'SHOWN_DISCLAIMERS',
+  WALLETS_NAVIGATION: networkForLocalStorage + '-WALLETS-NAVIGATION',
+  SELECTED_WALLET: 'SELECTED_WALLET',
 };
 
 export type SetCustomUserThemeRequest = {|
@@ -53,6 +61,8 @@ export type WalletsNavigation = {|
   cardano: number[],
 |};
 
+type Disclaimer = 'cashback' | 'buySellAda' | 'swap';
+
 /**
  * This api layer provides access to the electron local storage
  * for user settings that are not synced with any coin backend.
@@ -121,17 +131,17 @@ export default class LocalStorageApi {
   setUserRevampAnnouncementStatus: boolean => Promise<void> = status =>
     setLocalItem(storageKeys.IS_REVAMP_THEME_ANNOUNCED, status.toString());
 
-  // ========== Select Wallet ========== //
+  // ========== Legacy Select Wallet ========== //
 
   getSelectedWalletId: void => Promise<number | null> = async () => {
     let id = await getLocalItem(storageKeys.SELECTED_WALLET);
-    // previously it was stored in window.localStorage, which is not accessible in the mv3 service worker
     if (!id) {
-      id = window?.localStorage.getItem(storageKeys.SELECTED_WALLET);
-      if (/^\d+$/.test(id)) {
-        await this.setSelectedWalletId(Number(id));
+      id = window.localStorage?.getItem(storageKeys.SELECTED_WALLET);
+      if (!/^\d+$/.test(id)) {
+        id = null;
       }
     }
+
     if (!id) {
       return null;
     }
@@ -139,10 +149,15 @@ export default class LocalStorageApi {
     return Number(id);
   };
 
-  setSelectedWalletId: number => Promise<void> = async (id) => {
-    await setLocalItem(storageKeys.SELECTED_WALLET, id.toString());
+  // ========== Selected Wallet ========== //
+  getSelectedWalletPublicKey: void => Promise<?string> = async () => {
+    return await getLocalItem(storageKeys.SELECTED_WALLET_PUBLIC_KEY);
   };
 
+  setSelectedWalletPublicKey: string => Promise<void> = async (publicKey) => {
+    await setLocalItem(storageKeys.SELECTED_WALLET_PUBLIC_KEY, publicKey);
+  }
+
   // ========== Legacy Theme ========== //
 
   hasAnyLegacyThemeFlags: void => Promise<boolean> = async () => {
@@ -212,6 +227,19 @@ export default class LocalStorageApi {
 
   unsetToggleSidebar: void => Promise<void> = () => removeLocalItem(storageKeys.TOGGLE_SIDEBAR);
 
+  // ========== Expand / retract Sidebar ========== //
+
+  getBringSandbox: void => Promise<boolean> = () =>
+    getLocalItem(storageKeys.BRING_SANDBOX).then(s => s === 'true');
+
+  setBringSandbox: boolean => Promise<void> = flag => {
+    return flag
+      ? setLocalItem(storageKeys.BRING_SANDBOX, 'true')
+      : this.unsetBringSandbox();
+  };
+
+  unsetBringSandbox: void => Promise<void> = () => removeLocalItem(storageKeys.BRING_SANDBOX);
+
   // ============ External storage provider ============ //
 
   getExternalStorage: void => Promise<?SelectedExternalStorageProvider> = () =>
@@ -343,6 +371,60 @@ export default class LocalStorageApi {
 
   unsetIsAnalyticsAllowed: void => Promise<void> = () => removeLocalItem(storageKeys.IS_ANALYTICS_ALLOWED);
 
+  saveCashbackWalletId: (number) => Promise<void> = (id) => setLocalItem(
+    storageKeys.CASHBACK_WALLET_ID,
+    String(id)
+  );
+
+  getCashbackWalletId: () => Promise<number | null> = async () => {
+    const v = await getLocalItem(storageKeys.CASHBACK_WALLET_ID);
+    if (!v) {
+      return null;
+    }
+    return Number(v);
+  }
+
+  _getShownDisclaimerObject: () => Promise<Object> = async () => {
+    const raw = await getLocalItem(storageKeys.SHOWN_DISCLAIMERS);
+    const val = raw ? JSON.parse(raw) : {};
+    return val;
+  }
+
+  setShownDisclaimer: (Disclaimer) => Promise<void> = async (which) => {
+    const val = await this._getShownDisclaimerObject();
+    val[which] = true;
+    await setLocalItem(storageKeys.SHOWN_DISCLAIMERS, JSON.stringify(val));
+  };
+
+  isDisclaimerShown: (Disclaimer) => Promise<boolean> = async (which) => {
+    const val = await this._getShownDisclaimerObject();
+    return val[which] === true;
+  }
+
+  loadCurrentNetworkId: () => Promise<?number> = async () => {
+    const raw = await getLocalItem(storageKeys.CURRENT_NETWORK_ID);
+    if (raw == null) {
+      return undefined;
+    }
+    return Number(raw);
+  }
+
+  saveCurrentNetworkId: (number) => Promise<void> = async (networkId) => {
+    await setLocalItem(storageKeys.CURRENT_NETWORK_ID, String(networkId));
+  }
+
+  loadWalletListOrder: () => Promise<Array<string>> = async () => {
+    const raw = await getLocalItem(storageKeys.WALLET_LIST_ORDER);
+    if (raw == null) {
+      return [];
+    }
+    return JSON.parse(raw);
+  }
+
+  saveWalletListOrder: Array<string> => Promise<void> = async (publicKeyList) => {
+    await setLocalItem(storageKeys.WALLET_LIST_ORDER, JSON.stringify(publicKeyList));
+  }
+
   async reset(): Promise<void> {
     await this.unsetUserLocale();
     await this.unsetComplexityLevel();
@@ -355,6 +437,7 @@ export default class LocalStorageApi {
     await this.unsetAcceptedTosVersion();
     await this.unsetIsAnalyticsAllowed();
     await this.unsetPortfolioFiatPair();
+    await this.unsetBringSandbox();
   }
 
   getItem: string => Promise<?string> = key => getLocalItem(key);
diff --git a/packages/yoroi-extension/app/api/thunk.js b/packages/yoroi-extension/app/api/thunk.js
index aad58fddd0..c6fab20ae4 100644
--- a/packages/yoroi-extension/app/api/thunk.js
+++ b/packages/yoroi-extension/app/api/thunk.js
@@ -154,8 +154,8 @@ function patchWalletState(walletState: Object): WalletState {
   return walletState;
 }
 
-export async function getWallets(walletId?: number): Promise<Array<WalletState>> {
-  const resp = await callBackground({ type: GetWallets.typeTag, request: { walletId } });
+export async function getWallets(networkId: number): Promise<Array<WalletState>> {
+  const resp = await callBackground({ type: GetWallets.typeTag, request: { networkId } });
   if (resp.error) {
     console.error('error when loading wallets:', resp.error);
     throw new Error(`error when loading wallets: ${resp.error}`);
@@ -412,7 +412,12 @@ export const getProtocolParameters: GetProtocolParametersType = async (
 ) => {
   return await callBackground({ type: GetProtocolParameters.typeTag, request: { networkId } });
 }
-  
+
+
+export function setCashbackWallet(id: number): void {
+  chrome.runtime.sendMessage({ type: 'bring_rpc_request', function: 'set-cashback-wallet', params: id });
+}
+
 // Background -> UI notifications:
 const callbacks = Object.freeze({
   walletStateUpdate: [],
diff --git a/packages/yoroi-extension/app/assets/images/sidebar/cashback.inline.svg b/packages/yoroi-extension/app/assets/images/sidebar/cashback.inline.svg
new file mode 100644
index 0000000000..67c836e086
--- /dev/null
+++ b/packages/yoroi-extension/app/assets/images/sidebar/cashback.inline.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.46944 5.01207C8.80934 4.27863 8.12408 3.98923 7.51742 3.9998L7.5 3.99995C7.10218 3.99995 6.72064 4.15798 6.43934 4.43929C6.15804 4.72059 6 5.10212 6 5.49995C6 5.89777 6.15804 6.2793 6.43934 6.56061C6.72064 6.84191 7.10218 6.99995 7.5 6.99995H10.6419C10.3251 6.18851 9.92148 5.51433 9.46944 5.01207ZM11 8.99995V10.9999L5 10.9999L4 10.9999V8.99995H11ZM4.33772 6.99995C4.11743 6.53552 4 6.02379 4 5.49995C4 4.57169 4.36875 3.68145 5.02513 3.02507C5.67943 2.37077 6.56612 2.00228 7.4912 1.99996C8.81053 1.97987 10.0128 2.62607 10.956 3.67414C11.3497 4.11154 11.6987 4.61776 12 5.17651C12.3013 4.61776 12.6503 4.11154 13.044 3.67414C13.9872 2.62607 15.1895 1.97987 16.5088 1.99996C17.4339 2.00228 18.3206 2.37077 18.9749 3.02507C19.6312 3.68145 20 4.57169 20 5.49995C20 6.02379 19.8826 6.53552 19.6623 6.99995H20C21.1046 6.99995 22 7.89538 22 8.99995V10.9999C22 12.1045 21.1046 12.9999 20 12.9999V18.9999C20 19.7956 19.6839 20.5587 19.1213 21.1213C18.5587 21.6839 17.7957 21.9999 17 21.9999H7C6.20435 21.9999 5.44129 21.6839 4.87868 21.1213C4.31607 20.5587 4 19.7956 4 18.9999V12.9999C2.89543 12.9999 2 12.1045 2 10.9999V8.99995C2 7.89538 2.89543 6.99995 4 6.99995H4.33772ZM6 12.9999V18.9999C6 19.2652 6.10536 19.5195 6.29289 19.7071C6.48043 19.8946 6.73478 19.9999 7 19.9999H11V12.9999H6ZM13 12.9999V19.9999H17C17.2652 19.9999 17.5196 19.8946 17.7071 19.7071C17.8946 19.5195 18 19.2652 18 18.9999V12.9999H13ZM19 10.9999L20 10.9999V8.99995H13V10.9999L19 10.9999ZM16.5 6.99995C16.8978 6.99995 17.2794 6.84191 17.5607 6.56061C17.842 6.2793 18 5.89777 18 5.49995C18 5.10212 17.842 4.72059 17.5607 4.43929C17.2794 4.15798 16.8978 3.99995 16.5 3.99995L16.4826 3.9998C15.8759 3.98923 15.1907 4.27863 14.5306 5.01207C14.0785 5.51433 13.6749 6.18851 13.3581 6.99995H16.5Z" fill="white"/>
+</svg>
diff --git a/packages/yoroi-extension/app/components/buySell/BuySellDialog.js b/packages/yoroi-extension/app/components/buySell/BuySellDialog.js
index 3bc08499cc..1d06d7fa88 100644
--- a/packages/yoroi-extension/app/components/buySell/BuySellDialog.js
+++ b/packages/yoroi-extension/app/components/buySell/BuySellDialog.js
@@ -59,19 +59,11 @@ const messages = defineMessages({
     id: 'buysell.dialog.sellProviderFee',
     defaultMessage: '!!!2.5% fee',
   },
-  disclaimer: {
-    id: 'buysell.dialog.disclaimer',
-    defaultMessage: '!!!Disclaimer',
-  },
   disclaimerText: {
     id: 'buysell.dialog.disclaimerText',
     defaultMessage:
       '!!!Yoroi Wallet utilizes third-party web3 on-and-off ramp solutions for direct Fiat-ADA exchanges. By clicking "Proceed," you acknowledge that you will be redirected to our partner\'s website, where you may need to accept their terms and conditions.  Please note, the third party web3 solution may have limitations based on your location and financial institution.',
   },
-  proceed: {
-    id: 'buysell.dialog.proceed',
-    defaultMessage: 'PROCEED',
-  },
   urlGenerationErrorDialogTitle: {
     id: 'buysell.dialog.error.dialog.title',
     defaultMessage: '!!!url generation',
@@ -426,7 +418,7 @@ export default class BuySellDialog extends Component<Props, State> {
               <InfoIcon style={{ verticalAlign: 'middle' }} />
             </IconWrapper>
             <Typography style={{ verticalAlign: 'middle' }} color="ds.text_gray_medium">
-              {intl.formatMessage(messages.disclaimer)}
+              {intl.formatMessage(globalMessages.disclaimer)}
             </Typography>
           </header>
           <Typography color="ds.text_gray_medium">{intl.formatMessage(messages.disclaimerText)}</Typography>
@@ -494,7 +486,7 @@ export default class BuySellDialog extends Component<Props, State> {
         forceBottomDivider
         dialogActions={[
           {
-            label: intl.formatMessage(messages.proceed),
+            label: intl.formatMessage(globalMessages.proceed),
             primary: true,
             disabled: state.amountAda === '' || state.inputError !== null,
             onClick: this.onSubmit,
diff --git a/packages/yoroi-extension/app/components/settings/categories/general-setting/AboutYoroiSettingsBlock.js b/packages/yoroi-extension/app/components/settings/categories/general-setting/AboutYoroiSettingsBlock.js
index 5e1be3172d..8ae8b62f8a 100644
--- a/packages/yoroi-extension/app/components/settings/categories/general-setting/AboutYoroiSettingsBlock.js
+++ b/packages/yoroi-extension/app/components/settings/categories/general-setting/AboutYoroiSettingsBlock.js
@@ -18,7 +18,7 @@ import { ReactComponent as mediumSvg } from '../../../../assets/images/social/me
 import environment from '../../../../environment';
 import LinkButton from '../../../widgets/LinkButton';
 import { handleExternalLinkClick } from '../../../../utils/routing';
-import { Box, Link, Typography } from '@mui/material';
+import { Box, Button, Link, Typography } from '@mui/material';
 
 const messages = defineMessages({
   aboutYoroiLabel: {
@@ -77,6 +77,10 @@ const messages = defineMessages({
     id: 'settings.general.aboutYoroi.git.branch',
     defaultMessage: '!!!Branch:',
   },
+  switchNetwork: {
+    id: 'settings.general.aboutYoroi.switchNetwork',
+    defaultMessage: '!!!SWITCH NETWORK',
+  },
 });
 
 const basePageComponentPath = 'settings:general';
@@ -130,7 +134,8 @@ const socialMediaLinks = [
 const baseGithubUrl = 'https://github.com/Emurgo/yoroi-frontend/';
 
 type Props = {|
-  wallet: null | { isTestnet: boolean, ... }
+  wallet: null | { isTestnet: boolean, ... },
+  onSwitchNetwork: () => void,
 |};
 
 @observer
@@ -186,6 +191,13 @@ export default class AboutYoroiSettingsBlock extends Component<Props> {
           />
         )}
 
+        <Button
+          onClick={this.props.onSwitchNetwork}
+          variant="primary"
+        >
+          {intl.formatMessage(messages.switchNetwork)}
+        </Button>
+
         <div className={styles.aboutSocial}>
           <GridFlexContainer rowSize={socialMediaLinks.length}>
             {socialMediaLinks.map(link => (
diff --git a/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js b/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
new file mode 100644
index 0000000000..da7d7a21bb
--- /dev/null
+++ b/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
@@ -0,0 +1,200 @@
+// @flow
+import { Component } from 'react';
+import type { Node, ComponentType } from 'react';
+import { observer } from 'mobx-react';
+import classNames from 'classnames';
+import Select from '../../../common/Select';
+import { MenuItem, Typography, Stack } from '@mui/material';
+import { Box } from '@mui/system';
+import { defineMessages, intlShape, FormattedHTMLMessage } from 'react-intl';
+import ReactToolboxMobxForm from '../../../../utils/ReactToolboxMobxForm';
+import LocalizableError from '../../../../i18n/LocalizableError';
+import styles from './UnitOfAccountSettings.scss';
+import Dialog from '../../../widgets/Dialog';
+import VerticalFlexContainer from '../../../layout/VerticalFlexContainer';
+import LoadingSpinner from '../../../widgets/LoadingSpinner';
+import globalMessages from '../../../../i18n/global-messages';
+import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
+import WalletAccountIcon from '../../../topbar/WalletAccountIcon';
+import type { WalletChecksum } from '@emurgo/cip4-js';
+import { RevampSwitch } from '../../../widgets/Switch';
+import FormControlLabel from '@mui/material/FormControlLabel';
+
+const messages = defineMessages({
+  bringCashbackTitle: {
+    id: 'settings.cashback.title',
+    defaultMessage: '!!!Cashback rewards wallet',
+  },
+  note: {
+    id: 'settings.cashback.note',
+    defaultMessage:
+      '!!!Your connected wallet is the designated wallet for receiving ADA cashback rewards and applied to all partner websites. You can switch to a different wallet anytime to ensure your cashback is directed to your preferred wallet or select “None” to decline this service.',
+  },
+  label: {
+    id: 'settings.cashback.label',
+    defaultMessage: '!!!Connected Wallet',
+  },
+});
+
+type Props = {|
+  +onSelect: number => Promise<void>,
+  +isSubmitting: boolean,
+  +cardanoWallets: Array<{ publicDeriverId: number, name: string, plate: WalletChecksum, isTestnet: boolean, ... }>,
+  +currentValue: ?number,
+  +error?: ?LocalizableError,
+  +isUseSandbox: ?boolean,
+  +onSetUseSandbox: null | (boolean) => *,
+|};
+
+@observer
+class BringCashbackSettings extends Component<Props> {
+  static defaultProps = {
+    error: undefined,
+  };
+
+  static contextTypes: {| intl: $npm$ReactIntl$IntlFormat |} = {
+    intl: intlShape.isRequired,
+  };
+
+  form: ReactToolboxMobxForm = new ReactToolboxMobxForm({
+    fields: {
+      cashbackWalletId: {
+        label: this.context.intl.formatMessage(messages.label),
+      },
+    },
+  });
+
+  render(): Node {
+    const { cardanoWallets, error, currentValue, onSetUseSandbox } = this.props;
+    const { intl } = this.context;
+    const { form } = this;
+    const cashbackWalletId = form.$('cashbackWalletId');
+    const componentClassNames = classNames([styles.component, 'currency']);
+
+    const optionRenderer = option => {
+      return (
+        <MenuItem
+          key={option.publicDeriverId}
+          value={option.publicDeriverId}
+          sx={{ height: '60px' }}
+          id={'selectCashbackWallet-' + option.name + '-menuItem'}
+        >
+          <Box sx={{ display: 'flex' }}>
+            <WalletIcon imagePart={option.plate.ImagePart} />
+            <Box sx={{ marginLeft: '8px' }}>
+              <Typography variant="body1" color="ds.text_gray_medium">
+                {option.plate.TextPart}&nbsp;|&nbsp;{option.name}
+              </Typography>
+            </Box>
+          </Box>
+        </MenuItem>
+      );
+    };
+
+    const dialog = this.props.isSubmitting ? (
+      <Dialog title={intl.formatMessage(globalMessages.processingLabel)} closeOnOverlayClick={false}>
+        <VerticalFlexContainer>
+          <LoadingSpinner />
+        </VerticalFlexContainer>
+      </Dialog>
+    ) : null;
+
+    const mainnetWallets =
+      cardanoWallets.filter(({ isTestnet }) => !isTestnet);
+
+    return (
+      <Box
+        sx={{
+          b: '20px',
+          mt: '13px',
+        }}
+        className={componentClassNames}
+      >
+        {dialog}
+        <Typography component="h2" variant="body1" fontWeight={500} mb="16px">
+          {intl.formatMessage(messages.bringCashbackTitle)}
+        </Typography>
+
+        <Box
+          sx={{
+            width: '506px',
+            marginTop: '0px',
+          }}
+        >
+          <Select
+            formControlProps={{ error: !!error }}
+            helperText={error && intl.formatMessage(error, error.values)}
+            error={!!error}
+            {...cashbackWalletId.bind()}
+            onChange={this.props.onSelect}
+            value={currentValue}
+            menuProps={{
+              sx: {
+                '& .MuiMenu-paper': {
+                  maxHeight: '280px',
+                },
+              },
+            }}
+            renderValue={value => {
+              const wallet = cardanoWallets.find(({ publicDeriverId }) => publicDeriverId === value);
+              if (!wallet) {
+                throw new Error('unexpected selected value');
+              }
+              return (
+                <Stack direction="row">
+                  <WalletIcon imagePart={wallet.plate.ImagePart} />
+                  <Typography variant="body1" color="ds.text_gray_medium" mt="2px">
+                    {wallet.name} | {wallet.plate.TextPart}
+                  </Typography>
+                </Stack>
+              );
+            }}
+          >
+            {mainnetWallets.map(option => optionRenderer(option))}
+          </Select>
+          <Typography component="div" variant="caption1" display="inline-block" color="grayscale.700">
+            <FormattedHTMLMessage {...messages.note} />
+          </Typography>
+        </Box>
+        {onSetUseSandbox != null ? (
+          <FormControlLabel
+            label="Use Sandbox Backend"
+            control={
+              <Box ml="8px">
+                <RevampSwitch
+                  checked={this.props.isUseSandbox ?? false}
+                  onChange={event => onSetUseSandbox(event.target.checked)}
+                />
+              </Box>
+            }
+            labelPlacement="start"
+            sx={{ marginLeft: '0px', marginTop: '40px' }}
+          />
+        ) : null}
+      </Box>
+    );
+  }
+}
+
+export default (BringCashbackSettings: ComponentType<Props>);
+
+const WalletIcon = ({ imagePart }: {| imagePart: string |}) => {
+  return (
+    <Box
+      sx={{
+        width: `24px`,
+        height: `24px`,
+        borderRadius: `8px`,
+        alignItems: 'center',
+        justifyContent: 'center',
+        '& .identicon': {
+          borderRadius: `8px`,
+        },
+
+        marginRight: '16px',
+      }}
+    >
+      <WalletAccountIcon iconSeed={imagePart} saturationFactor={0} size={8} scalePx={4} />
+    </Box>
+  );
+};
diff --git a/packages/yoroi-extension/app/components/topbar/WalletListDialog.js b/packages/yoroi-extension/app/components/topbar/WalletListDialog.js
index 71c793d204..53c0b95409 100644
--- a/packages/yoroi-extension/app/components/topbar/WalletListDialog.js
+++ b/packages/yoroi-extension/app/components/topbar/WalletListDialog.js
@@ -4,7 +4,6 @@ import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
 import type { TokenLookupKey } from '../../api/common/lib/MultiToken';
 import type { TokenRow } from '../../api/ada/lib/storage/database/primitives/tables';
 import type { UnitOfAccountSettingType } from '../../types/unitOfAccountType';
-import type { WalletsNavigation } from '../../api/localStorage';
 import { BigNumber } from 'bignumber.js';
 import { Component } from 'react';
 import { observer } from 'mobx-react';
@@ -67,67 +66,25 @@ type Props = {|
   +unitOfAccountSetting: UnitOfAccountSettingType,
   +getCurrentPrice: (from: string, to: string) => ?string,
   +cardanoWallets: Array<WalletInfo>,
-  +walletsNavigation: WalletsNavigation,
-  +updateSortedWalletList: WalletsNavigation => Promise<void>,
+  +onUpdateWalletListOrder: (from: number, to: number) => Promise<void>,
   +onSelect: number => void,
   +selectedWalletId: ?number,
 |};
 type State = {|
-  cardanoWalletsIdx: number[],
   selectedWalletId: number | null,
 |};
 
-const reorder = (list, startIndex, endIndex) => {
-  const result = Array.from(list);
-  const [removed] = result.splice(startIndex, 1);
-  result.splice(endIndex, 0, removed);
-  return result;
-};
-
-const getGeneratedWalletIds = (sortedWalletListIdx, currentWalletIdx) => {
-  let generatedWalletIds;
-  if (sortedWalletListIdx !== undefined && sortedWalletListIdx.length > 0) {
-    const newWalletIds = currentWalletIdx.filter(id => {
-      const index = sortedWalletListIdx.indexOf(id);
-      if (index === -1) {
-        return true;
-      }
-      return false;
-    });
-    generatedWalletIds = [...sortedWalletListIdx, ...newWalletIds];
-  } else {
-    generatedWalletIds = currentWalletIdx;
-  }
-
-  return generatedWalletIds;
-};
 @observer
 export default class WalletListDialog extends Component<Props, State> {
   static contextTypes: {| intl: $npm$ReactIntl$IntlFormat |} = {
     intl: intlShape.isRequired,
   };
   state: State = {
-    cardanoWalletsIdx: [],
     selectedWalletId: null,
   };
 
   async componentDidMount(): Promise<void> {
-    const cardanoWalletsId = getGeneratedWalletIds(
-      this.props.walletsNavigation.cardano,
-      this.props.cardanoWallets.map(wallet => wallet.walletId)
-    );
-
-    this.setState(
-      {
-        cardanoWalletsIdx: cardanoWalletsId,
-        selectedWalletId: this.props.selectedWalletId,
-      },
-      async () => {
-        await this.props.updateSortedWalletList({
-          cardano: cardanoWalletsId,
-        });
-      }
-    );
+    this.setState({ selectedWalletId: this.props.selectedWalletId });
   }
 
   onDragEnd: (network: 'cardano', result: Object) => any = async (network, result) => {
@@ -135,20 +92,7 @@ export default class WalletListDialog extends Component<Props, State> {
     if (!destination || destination.index === source.index) {
       return;
     }
-
-    this.setState(
-      prev => {
-        const walletListIdx = reorder(prev.cardanoWalletsIdx, result.source.index, result.destination.index);
-        return {
-          cardanoWalletsIdx: walletListIdx,
-        };
-      },
-      async function () {
-        await this.props.updateSortedWalletList({
-          cardano: this.state.cardanoWalletsIdx,
-        });
-      }
-    );
+    this.props.onUpdateWalletListOrder(source.index, destination.index);
   };
 
   onSelect: void => void = () => {
@@ -165,7 +109,6 @@ export default class WalletListDialog extends Component<Props, State> {
 
   render(): Node {
     const { intl } = this.context;
-    const { cardanoWalletsIdx } = this.state;
 
     const {
       shouldHideBalance,
@@ -239,35 +182,25 @@ export default class WalletListDialog extends Component<Props, State> {
               <Droppable droppableId="cardano-list-droppable">
                 {provided => (
                   <div className={styles.list} {...provided.droppableProps} ref={provided.innerRef}>
-                    {cardanoWalletsIdx.length > 0 &&
-                      cardanoWalletsIdx
-                        .map((walletId, idx) => {
-                          const wallet = cardanoWallets.find(w => w.walletId === walletId);
-                          if (!wallet) {
-                            return null;
-                          }
-
-                          return (
-                            <WalletCard
-                              key={walletId}
-                              idx={idx}
-                              onSelect={() => this.setState({ selectedWalletId: wallet.walletId })}
-                              isCurrentWallet={this.isCurrentWallet(wallet.walletId, 'local')}
-                              plate={wallet.plate}
-                              type={wallet.type}
-                              name={wallet.name}
-                              rewards={wallet.rewards}
-                              shouldHideBalance={this.props.shouldHideBalance}
-                              walletAmount={wallet.amount}
-                              walletId={walletId}
-                              getTokenInfo={this.props.getTokenInfo}
-                              unitOfAccountSetting={unitOfAccountSetting}
-                              getCurrentPrice={getCurrentPrice}
-                              id="changeWalletDialog:walletsList"
-                            />
-                          );
-                        })
-                        .filter(Boolean)}
+                    {cardanoWallets.map((wallet, idx) => (
+                      <WalletCard
+                        key={wallet.walletId}
+                        idx={idx}
+                        onSelect={() => this.setState({ selectedWalletId: wallet.walletId })}
+                        isCurrentWallet={this.isCurrentWallet(wallet.walletId, 'local')}
+                        plate={wallet.plate}
+                        type={wallet.type}
+                        name={wallet.name}
+                        rewards={wallet.rewards}
+                        shouldHideBalance={this.props.shouldHideBalance}
+                        walletAmount={wallet.amount}
+                        walletId={wallet.walletId}
+                        getTokenInfo={this.props.getTokenInfo}
+                        unitOfAccountSetting={unitOfAccountSetting}
+                        getCurrentPrice={getCurrentPrice}
+                        id="changeWalletDialog:walletsList"
+                      />
+                    ))}
                     {provided.placeholder}
                   </div>
                 )}
diff --git a/packages/yoroi-extension/app/components/wallet/create-wallet/CreateWalletPage.js b/packages/yoroi-extension/app/components/wallet/create-wallet/CreateWalletPage.js
index 9b4412efd2..f95181fc22 100644
--- a/packages/yoroi-extension/app/components/wallet/create-wallet/CreateWalletPage.js
+++ b/packages/yoroi-extension/app/components/wallet/create-wallet/CreateWalletPage.js
@@ -5,14 +5,11 @@ import { Box } from '@mui/material';
 import { observer } from 'mobx-react';
 import CreateWalletSteps from './CreateWalletSteps';
 import LearnAboutRecoveryPhrase from './LearnAboutRecoveryPhrase';
-import { CREATE_WALLET_SETPS, getFirstStep, markDialogAsShown } from './steps';
+import { CREATE_WALLET_SETPS, markDialogAsShown } from './steps';
 import SaveRecoveryPhraseStep from './SaveRecoveryPhraseStep';
 import VerifyRecoveryPhraseStep from './VerifyRecoveryPhraseStep';
 import AddWalletDetailsStep from './AddWalletDetailsStep';
-import { networks } from '../../../api/ada/lib/storage/database/prepackaged/networks';
 import CreateWalletPageHeader from './CreateWalletPageHeader';
-import SelectNetworkStep from './SelectNetworkStep';
-import environment from '../../../environment';
 import { ROUTES } from '../../../routes-config';
 import type { NetworkRow } from '../../../api/ada/lib/storage/database/primitives/tables';
 import { ampli } from '../../../../ampli/index';
@@ -25,7 +22,6 @@ type Props = {|
     recoveryPhrase: Array<string>,
   |}) => void,
   selectedNetwork: $ReadOnly<NetworkRow>,
-  setSelectedNetwork: (params: void | $ReadOnly<NetworkRow>) => void,
   openDialog(dialog: any): void,
   closeDialog(): void,
   isDialogOpen(dialog: any): boolean,
@@ -42,14 +38,13 @@ function CreateWalletPage(props: Props): Node {
   const {
     genWalletRecoveryPhrase,
     createWallet,
-    setSelectedNetwork,
     selectedNetwork,
     isDialogOpen,
     openDialog,
     closeDialog,
     goToRoute,
   } = props;
-  const [currentStep, setCurrentStep] = useState(getFirstStep());
+  const [currentStep, setCurrentStep] = useState(CREATE_WALLET_SETPS.LEARN_ABOUT_RECOVERY_PHRASE);
   const setCurrentStepAndTrack = (step) => {
     setCurrentStep(step);
     if (step === CREATE_WALLET_SETPS.LEARN_ABOUT_RECOVERY_PHRASE) {
@@ -76,20 +71,9 @@ function CreateWalletPage(props: Props): Node {
   };
 
   const steps = {
-    [CREATE_WALLET_SETPS.SELECT_NETWORK]: (
-      <SelectNetworkStep
-        onSelect={network => {
-          setSelectedNetwork(network);
-          setCurrentStepAndTrack(CREATE_WALLET_SETPS.LEARN_ABOUT_RECOVERY_PHRASE);
-        }}
-        goBack={() => goToRoute(ROUTES.WALLETS.ADD)}
-      />
-    ),
     [CREATE_WALLET_SETPS.LEARN_ABOUT_RECOVERY_PHRASE]: (
       <LearnAboutRecoveryPhrase
         nextStep={() => {
-          if (!environment.isDev() && !environment.isNightly())
-            setSelectedNetwork(networks.CardanoMainnet);
           setCurrentStepAndTrack(CREATE_WALLET_SETPS.SAVE_RECOVERY_PHRASE);
           if (recoveryPhrase === null) {
             genWalletRecoveryPhrase()
@@ -101,12 +85,7 @@ function CreateWalletPage(props: Props): Node {
               });
           }
         }}
-        prevStep={() => {
-          if (environment.isProduction()) {
-            return goToRoute(ROUTES.WALLETS.ADD);
-          }
-          setCurrentStep(CREATE_WALLET_SETPS.SELECT_NETWORK);
-        }}
+        prevStep={() => goToRoute(ROUTES.WALLETS.ADD)}
         {...manageDialogsProps}
       />
     ),
@@ -142,9 +121,6 @@ function CreateWalletPage(props: Props): Node {
         prevStep={() => setCurrentStep(CREATE_WALLET_SETPS.VERIFY_RECOVERY_PHRASE)}
         onSubmit={(walletName: string, walletPassword: string) => {
           if (!recoveryPhrase) throw new Error('Recovery phrase must be generated first');
-          if (!environment.isDev() && !environment.isNightly()) {
-            setSelectedNetwork(networks.CardanoMainnet);
-          }
 
           if (!selectedNetwork)
             throw new Error('Network must be selected to create a wallet. Should never happen');
@@ -163,7 +139,6 @@ function CreateWalletPage(props: Props): Node {
   };
 
   const CurrentStep = steps[currentStep];
-  if (currentStep === CREATE_WALLET_SETPS.SELECT_NETWORK) return CurrentStep;
 
   return (
     <Box>
diff --git a/packages/yoroi-extension/app/components/wallet/create-wallet/steps.js b/packages/yoroi-extension/app/components/wallet/create-wallet/steps.js
index 3a9ee15cc2..b8f5ba50ee 100644
--- a/packages/yoroi-extension/app/components/wallet/create-wallet/steps.js
+++ b/packages/yoroi-extension/app/components/wallet/create-wallet/steps.js
@@ -1,12 +1,9 @@
 // @flow
-import environment from '../../../environment';
-
 export const CREATE_WALLET_SETPS = Object.freeze({
   LEARN_ABOUT_RECOVERY_PHRASE: 'LEARN_ABOUT_RECOVER_PHRASE',
   SAVE_RECOVERY_PHRASE: 'SAVE_RECOVERY_PHRASE',
   VERIFY_RECOVERY_PHRASE: 'VERIFY_RECOVERY_PHRASE',
   ADD_WALLET_DETAILS: 'ADD_WALLET_DETAILS',
-  SELECT_NETWORK: 'SELECT_NETWORK',
 });
 
 export const TIPS_DIALOGS = Object.freeze({
@@ -16,14 +13,6 @@ export const TIPS_DIALOGS = Object.freeze({
   WALLET_CHECKSUM: 'WALLET_CHECKSUM',
 });
 
-export function getFirstStep(): string {
-  if (environment.isDev() || environment.isNightly()) {
-    return CREATE_WALLET_SETPS.SELECT_NETWORK;
-  }
-
-  return CREATE_WALLET_SETPS.LEARN_ABOUT_RECOVERY_PHRASE;
-}
-
 const asDialogId: string => string = (dialogId: string) => `dialog__${dialogId}`;
 
 export function markDialogAsShown(dialogId: string): void {
diff --git a/packages/yoroi-extension/app/components/wallet/restore/RestoreWalletPage.js b/packages/yoroi-extension/app/components/wallet/restore/RestoreWalletPage.js
index e5bc417ae8..075d5d305e 100644
--- a/packages/yoroi-extension/app/components/wallet/restore/RestoreWalletPage.js
+++ b/packages/yoroi-extension/app/components/wallet/restore/RestoreWalletPage.js
@@ -5,17 +5,14 @@ import { useState } from 'react';
 import { defineMessages, injectIntl } from 'react-intl';
 import { Box, Typography, styled } from '@mui/material';
 import { observer } from 'mobx-react';
-import { RESTORE_WALLET_STEPS, getFirstRestorationStep } from './steps';
+import { RESTORE_WALLET_STEPS } from './steps';
 import { ReactComponent as YoroiLogo } from '../../../assets/images/yoroi-logo-shape-blue.inline.svg';
 import SelectWalletTypeStep from './steps/type/SelectWalletTypeStep';
 import Stepper from '../../common/stepper/Stepper';
 import EnterRecoveryPhraseStep from './steps/phrase/EnterRecoveryPhraseStep';
 import AddWalletDetailsStep from '../create-wallet/AddWalletDetailsStep';
-import { networks } from '../../../api/ada/lib/storage/database/prepackaged/networks';
 import { markDialogAsShown } from '../dialogs/utils';
 import { ROUTES } from '../../../routes-config';
-import SelectNetworkStep from '../create-wallet/SelectNetworkStep';
-import environment from '../../../environment';
 import { useRestoreWallet } from './hooks';
 import { ampli } from '../../../../ampli/index';
 import { runInAction } from 'mobx';
@@ -80,7 +77,7 @@ function RestoreWalletPage(props: Props & Intl): Node {
     tokenInfoStore,
   } = stores;
 
-  const [currentStep, setCurrentStep] = useState(getFirstRestorationStep());
+  const [currentStep, setCurrentStep] = useState(RESTORE_WALLET_STEPS.SELECT_WALLET_TYPE);
   const [selectedRestoreMode, setSelectedRestoreMode] = useState<?RestoreModeType>(null);
   const { recoveryPhrase, duplicatedWallet, setRestoreWalletData, resetRestoreWalletData } = useRestoreWallet();
 
@@ -115,20 +112,6 @@ function RestoreWalletPage(props: Props & Intl): Node {
   }
 
   const steps = {
-    [RESTORE_WALLET_STEPS.SELECT_NETWORK]: {
-      stepId: RESTORE_WALLET_STEPS.SELECT_NETWORK,
-      message: messages.firstStep,
-      component: (
-        <SelectNetworkStep
-          onSelect={network => {
-            stores.profile.setSelectedNetwork(network);
-            setCurrentStep(RESTORE_WALLET_STEPS.SELECT_WALLET_TYPE);
-            ampli.restoreWalletTypeStepViewed();
-          }}
-          goBack={goToAddWalletScreen}
-        />
-      ),
-    },
     [RESTORE_WALLET_STEPS.SELECT_WALLET_TYPE]: {
       stepId: RESTORE_WALLET_STEPS.SELECT_WALLET_TYPE,
       message: messages.firstStep,
@@ -136,8 +119,6 @@ function RestoreWalletPage(props: Props & Intl): Node {
         <SelectWalletTypeStep
           onNext={mode => {
             resetRestoreWalletData();
-            if (!environment.isDev() && !environment.isNightly())
-              stores.profile.setSelectedNetwork(networks.CardanoMainnet);
             runInAction(() => {
               setSelectedRestoreMode(mode);
               setCurrentStep(RESTORE_WALLET_STEPS.ENTER_RECOVERY_PHRASE);
@@ -148,8 +129,7 @@ function RestoreWalletPage(props: Props & Intl): Node {
           }}
           goBack={() => {
             resetRestoreWalletData();
-            if (!environment.isDev() && !environment.isNightly()) goToAddWalletScreen();
-            else setCurrentStep(RESTORE_WALLET_STEPS.SELECT_NETWORK);
+            goToAddWalletScreen();
           }}
         />
       ),
@@ -225,12 +205,9 @@ function RestoreWalletPage(props: Props & Intl): Node {
 
   const stepperSteps = Object.keys(steps)
     .map(key => ({ stepId: steps[key].stepId, message: steps[key].message }))
-    .filter(step => step.stepId !== RESTORE_WALLET_STEPS.SELECT_NETWORK);
 
   const CurrentStep = steps[currentStep].component;
 
-  if (currentStep === RESTORE_WALLET_STEPS.SELECT_NETWORK) return CurrentStep;
-
   return (
     <Box>
       <Box
diff --git a/packages/yoroi-extension/app/components/wallet/restore/steps.js b/packages/yoroi-extension/app/components/wallet/restore/steps.js
index 30f13bc1c7..ba51f77d05 100644
--- a/packages/yoroi-extension/app/components/wallet/restore/steps.js
+++ b/packages/yoroi-extension/app/components/wallet/restore/steps.js
@@ -1,15 +1,6 @@
 // @flow
-import environment from '../../../environment';
-
 export const RESTORE_WALLET_STEPS = Object.freeze({
-  SELECT_NETWORK: 'SELECT_NETWORK',
   SELECT_WALLET_TYPE: 'SELECT_WALLET_TYPE',
   ENTER_RECOVERY_PHRASE: 'ENTER_RECOVERY_PHRASE',
   ADD_WALLET_DETAILS: 'ADD_WALLET_DETAILS',
 });
-
-export function getFirstRestorationStep(): string {
-  if (environment.isDev() || environment.isNightly()) return RESTORE_WALLET_STEPS.SELECT_NETWORK;
-
-  return RESTORE_WALLET_STEPS.SELECT_WALLET_TYPE;
-}
diff --git a/packages/yoroi-extension/app/components/wallet/settings/SwitchNetworkDialog.js b/packages/yoroi-extension/app/components/wallet/settings/SwitchNetworkDialog.js
new file mode 100644
index 0000000000..51cd347563
--- /dev/null
+++ b/packages/yoroi-extension/app/components/wallet/settings/SwitchNetworkDialog.js
@@ -0,0 +1,106 @@
+// @flow
+import type { Node } from 'react';
+import { Component } from 'react';
+import { observer } from 'mobx-react';
+import { defineMessages, intlShape } from 'react-intl';
+import ReactToolboxMobxForm from '../../../utils/ReactToolboxMobxForm';
+import DialogCloseButton from '../../widgets/DialogCloseButton';
+import Dialog from '../../widgets/Dialog';
+import globalMessages from '../../../i18n/global-messages';
+import type { $npm$ReactIntl$IntlFormat, $npm$ReactIntl$MessageDescriptor } from 'react-intl';
+import { MenuItem, Box } from '@mui/material';
+import { styled } from '@mui/material/styles';
+import Select from '../../common/Select';
+
+const messages = defineMessages({
+  dialogTitle: {
+    id: 'settings.general.switchNetwork.dialog.title',
+    defaultMessage: '!!!Switch network',
+  },
+  dialogText: {
+    id: 'settings.general.switchNetwork.dialog.text',
+    defaultMessage: '!!!The Cardano network is a technical infrastructure combining Cardano nodes and their interactions in one unified system. It consists of a collection of nodes that communicate with each other to maintain the distributed ledger.',
+  },
+  applyButton: {
+    id: 'settings.general.switchNetwork.dialog.button.apply',
+    defaultMessage: '!!!apply',
+  },
+  selectLabel: {
+    id: 'settings.general.switchNetwork.dialog.label.select',
+    defaultMessage: '!!!Select Network',
+  },
+});
+
+const DialogText = styled(Box)(() => ({
+  fontSize: '16px',
+  fontWeight: 400,
+  lineHeight: '24px',
+}));
+
+type Props = {|
+  +onCancel: void => void,
+  +networks: Array<{|
+    id: number,
+    name: $npm$ReactIntl$MessageDescriptor,
+  |}>,
+  +onApply: (number) => Promise<void>,
+  +currentNetworkId: number,
+|};
+
+@observer
+export default class Switch extends Component<Props> {
+  static contextTypes: {| intl: $npm$ReactIntl$IntlFormat |} = {
+    intl: intlShape.isRequired,
+  };
+
+  form: ReactToolboxMobxForm = new ReactToolboxMobxForm({
+    fields: {
+      selectedNetwork: {
+        label: this.context.intl.formatMessage(messages.selectLabel),
+        value: this.props.currentNetworkId,
+      },
+    },
+  });
+
+  render(): Node {
+    const { intl } = this.context;
+    const { onCancel, onApply, networks } = this.props;
+
+    return (
+      <Dialog
+        title={intl.formatMessage(messages.dialogTitle)}
+        closeOnOverlayClick={false}
+        onClose={onCancel}
+        closeButton={<DialogCloseButton onClose={onCancel} />}
+        id="switchNetworkDialog"
+        dialogActions={[
+          {
+            label: intl.formatMessage(globalMessages.cancel),
+            onClick: onCancel,
+            primary: false,
+          },
+          {
+            label: intl.formatMessage(messages.applyButton),
+            onClick: () => onApply(this.form.$('selectedNetwork').value),
+            primary: true,
+          },
+        ]}          
+      >
+        <DialogText>
+          {intl.formatMessage(messages.dialogText)}
+        </DialogText>
+        <Select
+          formControlProps={{ sx: { marginTop: '25px' } }}
+          labelId="network-select"
+          {...this.form.$('selectedNetwork').bind()}
+        >
+          {networks.map(({ id, name }) => (
+            <MenuItem value={id} key={id}>
+              {intl.formatMessage(name)}
+            </MenuItem>
+          ))}
+        </Select>
+      </Dialog>
+    );
+  }
+}
diff --git a/packages/yoroi-extension/app/components/widgets/DisclaimerDialog.js b/packages/yoroi-extension/app/components/widgets/DisclaimerDialog.js
new file mode 100644
index 0000000000..2023ec928c
--- /dev/null
+++ b/packages/yoroi-extension/app/components/widgets/DisclaimerDialog.js
@@ -0,0 +1,94 @@
+// @flow
+import { useState } from 'react';
+import { injectIntl, defineMessages, type $npm$ReactIntl$IntlShape } from 'react-intl';
+import Dialog from './Dialog';
+import globalMessages from '../../i18n/global-messages';
+import { Typography, Checkbox, FormControlLabel } from '@mui/material';
+import { styled } from '@mui/material/styles';
+
+const messages = defineMessages({
+  disclaimer: {
+    id: 'cashback.disclaimer',
+    defaultMessage: '!!!By clicking "Proceed," you acknowledge that you will be redirected to a third-party service provider offering cashback services in ADA currency. You may be required to agree to the terms, conditions, and privacy policies of the third-party provider to complete the transaction. Yoroi Wallet does not control, endorse, or assume responsibility for the content, security, policies, or services provided by the third party.',
+  },
+  disclaimerNote: {
+    id: 'cashback.disclaimer.note',
+    defaultMessage: '!!!Please note:',
+  },
+  disclaimerNote1: {
+    id: 'cashback.disclaimer.note.1',
+    defaultMessage: '!!!1. Yoroi Wallet is not liable for any losses, delays, or errors that may occur while using the third-party service.',
+  },
+  disclaimerNote2: {
+    id: 'cashback.disclaimer.note.2',
+    defaultMessage: '!!!2. Transactions may be subject to restrictions based on your geographic location, applicable laws, financial institution policies, or the service provider\'s limitations.',
+  },
+  disclaimerNote3: {
+    id: 'cashback.disclaimer.note.3',
+    defaultMessage: '!!!3. Ensure you review and understand the third party\'s terms, as your interactions are solely governed by their agreements.',
+  },
+  disclaimerNote4: {
+    id: 'cashback.disclaimer.note.4',
+    defaultMessage: '!!!4. Yoroi Wallet does not collect or store any personal or financial data submitted through the third-party platform.',
+  },
+  disclaimerAgree: {
+    id: 'cashback.disclaimer.agree',
+    defaultMessage: '!!!I understand this disclaimer.',
+  },
+});
+
+type Props = {|
+  onProceed: () => void,
+|};
+type Intl = {|
+  intl: $npm$ReactIntl$IntlShape
+|};
+
+const DisclaimerText = styled(Typography)(() => ({
+  fontSize: '16px',
+  lineHeight: '24px',
+}));
+const DisclaimerBold = styled(Typography)(() => ({
+  fontSize: '16px',
+  lineHeight: '24px',
+  fontWeight: 500,
+}));
+
+const DisclaimerDialog: React$ComponentType<Props> = injectIntl((props: Props & Intl) => {
+  const { intl } = props;
+  const [disclaimerAgreed, setDisclaimerAgreed] = useState(false);
+  return (
+    <Dialog
+      title={intl.formatMessage(globalMessages.disclaimer)}
+      dialogActions={[
+        {
+          label: intl.formatMessage(globalMessages.proceed),
+          onClick: props.onProceed,
+          disabled: !disclaimerAgreed,
+          primary: true,
+        }
+      ]}
+    >
+      <DisclaimerText>{intl.formatMessage(messages.disclaimer)}</DisclaimerText>
+      <DisclaimerText>&nbsp;</DisclaimerText>
+      <DisclaimerBold>{intl.formatMessage(messages.disclaimerNote)}</DisclaimerBold>
+      <DisclaimerText>{intl.formatMessage(messages.disclaimerNote1)}</DisclaimerText>
+      <DisclaimerText>{intl.formatMessage(messages.disclaimerNote2)}</DisclaimerText>
+      <DisclaimerText>{intl.formatMessage(messages.disclaimerNote3)}</DisclaimerText>
+      <DisclaimerText>{intl.formatMessage(messages.disclaimerNote4)}</DisclaimerText>
+      <DisclaimerText>&nbsp;</DisclaimerText>
+      <FormControlLabel
+        sx={{ marginLeft: '0px' }}
+        control={
+          <Checkbox
+            checked={disclaimerAgreed}
+            onChange={(event) => setDisclaimerAgreed(event.target.checked)}
+          />
+        }
+        label={intl.formatMessage(messages.disclaimerAgree)}
+      />
+    </Dialog>
+  );
+});
+
+export default DisclaimerDialog;
diff --git a/packages/yoroi-extension/app/connector/App.js b/packages/yoroi-extension/app/connector/App.js
index 6994d4ca6a..1d47137bc4 100644
--- a/packages/yoroi-extension/app/connector/App.js
+++ b/packages/yoroi-extension/app/connector/App.js
@@ -124,7 +124,11 @@ class App extends Component<Props, State> {
     if (this.state.crashed === true) {
       return <CrashPage />;
     }
-    return <Router history={history}>{Routes(stores)}</Router>;
+    return (
+      <Router history={history}>
+        <Routes stores={stores} />
+      </Router>
+    );
   };
 }
 
diff --git a/packages/yoroi-extension/app/connector/Routes.js b/packages/yoroi-extension/app/connector/Routes.js
index 84a97b2105..19d7bbdbf0 100644
--- a/packages/yoroi-extension/app/connector/Routes.js
+++ b/packages/yoroi-extension/app/connector/Routes.js
@@ -1,21 +1,40 @@
 // @flow
 import type { Node } from 'react';
-import { Route, Switch } from 'react-router-dom';
+import { Route, Switch, useLocation } from 'react-router-dom';
 import type { StoresMap } from './stores/index';
 import { ROUTES } from './routes-config';
+import Helmet from 'react-helmet';
+import { injectIntl } from 'react-intl';
+import type { $npm$ReactIntl$IntlShape } from 'react-intl';
+import { observer } from 'mobx-react';
 
 // PAGES
 import ConnectContainer from './containers/ConnectContainer';
-import Layout from './components/layout/Layout';
+import Layout, { messages } from './components/layout/Layout';
 import SignTxContainer from './containers/SignTxContainer';
 import LoadingPage from '../containers/LoadingPage';
+import SelectCashbackWalletContainer from './containers/SelectCashbackWalletContainer';
 
-export const Routes = (stores: StoresMap): Node => {
-  if (stores.loading.isLoading) {
-    return <LoadingPage stores={stores} />;
-  }
-  return wrapPages(getContent(stores));
-};
+type Props = {| stores: StoresMap |};
+type Intl = {| intl: $npm$ReactIntl$IntlShape |};
+export const Routes: React$ComponentType<Props>  = injectIntl(observer((props: Props & Intl) => {
+  const { stores, intl } = props;
+  const title = intl.formatMessage(
+    useLocation().pathname === ROUTES.SELECT_CASHBACK_WALLET ?
+      messages.yoroiConnector : messages.yoroiDappConnector
+  );
+
+  return (
+    <>
+      <Helmet><title>Yoroi Connector</title></Helmet>
+      {stores.loading.isLoading ? (
+        <LoadingPage stores={stores} />
+      ) : (
+        wrapPages(getContent(stores))
+      )}
+    </>
+  );
+}));
 
 const getContent = (stores) => (
   <Switch>
@@ -29,6 +48,11 @@ const getContent = (stores) => (
       path={ROUTES.SIGNIN_TRANSACTION}
       component={props => <SignTxContainer {...props} stores={stores} />}
     />
+    <Route
+      exact
+      path={ROUTES.SELECT_CASHBACK_WALLET}
+      component={props => <SelectCashbackWalletContainer {...props} stores={stores} />}
+    />
   </Switch>
 );
 
diff --git a/packages/yoroi-extension/app/connector/components/connect/ConnectPage.js b/packages/yoroi-extension/app/connector/components/connect/ConnectPage.js
index 090dd697e0..774291477a 100644
--- a/packages/yoroi-extension/app/connector/components/connect/ConnectPage.js
+++ b/packages/yoroi-extension/app/connector/components/connect/ConnectPage.js
@@ -73,6 +73,18 @@ const messages = defineMessages({
     id: 'connector.connect.hardwareWalletsConnectWithAuthNotSupported',
     defaultMessage: '!!!Connecting to hardware wallet with authentication is not supported',
   },
+  cashbackApplyAll: {
+    id: 'connector.connect.cashback.apply.all',
+    defaultMessage: '!!!The wallet you select will be applied for all partner websites.'
+  },
+  cashbackDisabledTrezor: {
+    id: 'connector.connect.cashback.trezor.disabled',
+    defaultMessage: '!!!Cashback service doesn’t support Trezor wallet connection',
+  },
+  addWallet: {
+    id: 'connector.connect.cashback.addWallet',
+    defaultMessage: '!!!Add wallet',
+  },
 });
 
 type Props = {|
@@ -96,6 +108,7 @@ type Props = {|
   +unitOfAccount: UnitOfAccountSettingType,
   +getCurrentPrice: (from: string, to: string) => ?string,
   +onUpdateHideBalance: void => Promise<void>,
+  +isSelectingCashbackWallet?: boolean,
 |};
 
 @observer
@@ -184,6 +197,7 @@ export default class ConnectPage extends Component<Props> {
       isAppAuth,
       onUpdateHideBalance,
       selectedWallet,
+      isSelectingCashbackWallet = false,
     } = this.props;
 
     const isNightly = environment.isNightly();
@@ -255,7 +269,7 @@ export default class ConnectPage extends Component<Props> {
       <div className={componentClasses}>
         {hasWallets ? (
           <>
-            <ProgressBar step={isAppAuth ? 2 : 1} max={2} />
+            {!isSelectingCashbackWallet && (<ProgressBar step={isAppAuth ? 2 : 1} max={2} />)}
             <Typography
               component="div"
               variant="h4"
@@ -269,19 +283,21 @@ export default class ConnectPage extends Component<Props> {
             >
               {intl.formatMessage(messages.connectWallet)}
             </Typography>
-            <div className={styles.connectWrapper}>
-              <div className={styles.image}>
-                {faviconUrl != null && faviconUrl !== '' ? <img src={faviconUrl} alt={`${url} favicon`} /> : <NoDappIcon />}
-              </div>
-              <Box marginTop="16px">
-                <Typography component="div" variant="body-1" fontWeight="400" color="gray.900">
-                  {intl.formatMessage(messages.subtitle)}{' '}
-                  <Typography as="span" variant="body-1" fontWeight="500">
-                    {url}
+            {!isSelectingCashbackWallet && (
+              <div className={styles.connectWrapper}>
+                <div className={styles.image}>
+                  {faviconUrl != null && faviconUrl !== '' ? <img src={faviconUrl} alt={`${url} favicon`} /> : <NoDappIcon />}
+                </div>
+                <Box marginTop="16px">
+                  <Typography component="div" variant="body-1" fontWeight="400" color="gray.900">
+                    {intl.formatMessage(messages.subtitle)}{' '}
+                    <Typography as="span" variant="body-1" fontWeight="500">
+                      {url}
+                    </Typography>
                   </Typography>
-                </Typography>
-              </Box>
-            </div>
+                </Box>
+              </div>
+            )}
           </>
         ) : null}
         <Box flex={1}>
@@ -305,47 +321,87 @@ export default class ConnectPage extends Component<Props> {
                     </button>
                   </div>
 
+                  {isSelectingCashbackWallet && (
+                    <div className={styles.cashbackApplyAll}>{intl.formatMessage(messages.cashbackApplyAll)}</div>
+                  )}
+
                   <ul className={styles.list}>
-                    {publicDerivers.map((wallet, idx) => (
-                      <li key={wallet.publicDeriverId} className={styles.listItem}>
-                        <WalletButton onClick={() => onSelectWallet(wallet, wallet.plate)}>
-                          <ConnectedWallet
-                            publicDeriver={wallet}
-                            walletBalance={
-                              <Box
-                                sx={{
-                                  ml: 'auto',
-                                  textAlign: 'right',
-                                }}
-                              >
-                                <AmountDisplay
-                                  shouldHideBalance={this.props.shouldHideBalance}
-                                  amount={wallet.balance}
-                                  getTokenInfo={this.props.getTokenInfo}
-                                  unitOfAccountSetting={this.props.unitOfAccount}
-                                  getCurrentPrice={this.props.getCurrentPrice}
-                                  showFiat
-                                  showAmount
-                                  id={'dAppConnector:connect:walletList:walletCard_' + idx}
-                                />
-                              </Box>
-                            }
-                          />
-                        </WalletButton>
-                      </li>
-                    ))}
+                    {publicDerivers.map((wallet, idx) => {
+                      const isTrezor = isSelectingCashbackWallet && wallet.type === 'trezor';
+                      const Btn = isTrezor ? DisabledWalletButton : WalletButton;
+                      return (
+                        <li
+                          key={wallet.publicDeriverId}
+                          className={[styles.listItem, isTrezor ? '' : styles.enabledWallet].join(' ')}
+                        >
+                          <Btn onClick={() => onSelectWallet(wallet, wallet.plate)}>
+                            <ConnectedWallet
+                              disabledForReason={
+                                isTrezor ? intl.formatMessage(messages.cashbackDisabledTrezor) : null
+                              }
+                              publicDeriver={wallet}
+                              walletBalance={
+                                <Box
+                                  sx={{
+                                    ml: 'auto',
+                                    textAlign: 'right',
+                                  }}
+                                >
+                                  <AmountDisplay
+                                    shouldHideBalance={this.props.shouldHideBalance}
+                                    amount={wallet.balance}
+                                    getTokenInfo={this.props.getTokenInfo}
+                                    unitOfAccountSetting={this.props.unitOfAccount}
+                                    getCurrentPrice={this.props.getCurrentPrice}
+                                    showFiat
+                                    showAmount
+                                    id={'dAppConnector:connect:walletList:walletCard_' + idx}
+                                  />
+                                </Box>
+                              }
+                            />
+                          </Btn>
+                        </li>
+                      );
+                    })}
                   </ul>
                 </div>
               ) : null}
             </>
           )}
         </Box>
-        {hasWallets && !isAppAuth ? (
+        {!isSelectingCashbackWallet && hasWallets && !isAppAuth ? (
           <div className={styles.bottom}>
             <div className={styles.infoText}>{intl.formatMessage(messages.connectInfo)}</div>
             <div className={styles.infoText}>{intl.formatMessage(connectorMessages.messageReadOnly)}</div>
           </div>
         ) : null}
+        {isSelectingCashbackWallet && (
+          <Box sx={{ display: 'flex', gap: '15px', padding: '32px' }}>
+            <Button
+              sx={{ minWidth: 0 }}
+              fullWidth
+              variant="outlined"
+              color="primary"
+              onClick={this.onCancel}
+              id="cancelButton"
+            >
+              {intl.formatMessage(globalMessages.cancel)}
+            </Button>
+            <Button
+              variant="contained"
+              color="primary"
+              fullWidth
+              onClick={() => {
+                this.onCreateWallet();
+              }}
+              sx={{ minWidth: 0 }}
+              id="addWalletButton"
+            >
+              {intl.formatMessage(messages.addWallet)}
+            </Button>
+          </Box>
+        )}
       </div>
     );
   }
@@ -357,3 +413,6 @@ const WalletButton = styled('button')({
   fontSize: '1rem',
   padding: '16px',
 });
+const DisabledWalletButton = styled(WalletButton)({
+  cursor: 'default',
+});
diff --git a/packages/yoroi-extension/app/connector/components/connect/ConnectPage.scss b/packages/yoroi-extension/app/connector/components/connect/ConnectPage.scss
index 043799529d..a8703b2b00 100644
--- a/packages/yoroi-extension/app/connector/components/connect/ConnectPage.scss
+++ b/packages/yoroi-extension/app/connector/components/connect/ConnectPage.scss
@@ -92,6 +92,13 @@
   }
 }
 
+.cashbackApplyAll {
+  margin-left: 16px;
+  font-weight: 400;
+  font-size: 14px;
+  line-height: 16px;
+}
+
 .list {
   & .listItem {
     border: 1px solid #fff;
@@ -105,12 +112,12 @@
       width: 100%;
       color: var(--yoroi-palette-gray-900);
     }
-
+  }
+  & .enabledWallet {
     &:hover {
       border-color: #c4cad7;
     }
   }
-
   overflow: auto;
 }
 
diff --git a/packages/yoroi-extension/app/connector/components/connect/ConnectedWallet.js b/packages/yoroi-extension/app/connector/components/connect/ConnectedWallet.js
index 7ce9265b7c..36771356b6 100644
--- a/packages/yoroi-extension/app/connector/components/connect/ConnectedWallet.js
+++ b/packages/yoroi-extension/app/connector/components/connect/ConnectedWallet.js
@@ -10,6 +10,7 @@ import type { WalletState } from '../../../../chrome/extension/background/types'
 type Props = {|
   +publicDeriver: WalletState,
   +walletBalance?: Node,
+  +disabledForReason?: ?string,
 |};
 
 function constructPlate(
@@ -35,7 +36,7 @@ export default class WalletCard extends Component<Props> {
   };
 
   render(): Node {
-    const { publicDeriver, walletBalance } = this.props;
+    const { publicDeriver, walletBalance, disabledForReason } = this.props;
     // eslint-disable-next-line no-unused-vars
     const [_, iconComponent] = publicDeriver.plate
       ? constructPlate(publicDeriver.plate, 0, styles.icon)
@@ -44,25 +45,28 @@ export default class WalletCard extends Component<Props> {
     const checksum = this.props.publicDeriver.plate?.TextPart;
 
     return (
-      <Box className={styles.card}>
-        <div className={styles.wrapper}>
-          <div className={styles.avatar}>{iconComponent}</div>
-          <div className={styles.nameWrapper}>
-            <Typography
-              component="div"
-              color="#242838"
-              fontWeight="500"
-              variant="b1"
-              fontSize={16}
-              id="connectedWalletName"
-            >
-              {this.props.publicDeriver.name}
-            </Typography>
-            <div className={styles.checksum} id="connectedWalletPlate">{checksum}</div>
+      <>
+        <Box className={styles.card}>
+          <div className={styles.wrapper}>
+            <div className={styles.avatar}>{iconComponent}</div>
+            <div className={styles.nameWrapper}>
+              <Typography
+                component="div"
+                color="#242838"
+                fontWeight="500"
+                variant="b1"
+                fontSize={16}
+                id="connectedWalletName"
+              >
+                {this.props.publicDeriver.name}
+              </Typography>
+              <div className={styles.checksum} id="connectedWalletPlate">{checksum}</div>
+            </div>
+            {walletBalance != null && <Box sx={{ ml: 'auto' }}>{walletBalance}</Box>}
           </div>
-          {walletBalance != null && <Box sx={{ ml: 'auto' }}>{walletBalance}</Box>}
-        </div>
-      </Box>
+        </Box>
+        {disabledForReason && (<div className={styles.disabledReason}>{disabledForReason}</div>)}
+      </>
     );
   }
 }
diff --git a/packages/yoroi-extension/app/connector/components/connect/ConnectedWallet.scss b/packages/yoroi-extension/app/connector/components/connect/ConnectedWallet.scss
index 9f846562d5..d6187b178f 100644
--- a/packages/yoroi-extension/app/connector/components/connect/ConnectedWallet.scss
+++ b/packages/yoroi-extension/app/connector/components/connect/ConnectedWallet.scss
@@ -50,3 +50,12 @@
     font-size: 14px;
   }
 }
+
+.disabledReason {
+  font-size: 12px;
+  font-weight: 400;
+  line-height: 16px;
+  letter-spacing: 0.20000000298023224px;
+  text-align: left;
+  color: var(--text-error, rgba(255, 19, 81, 1));
+}
diff --git a/packages/yoroi-extension/app/connector/components/layout/Layout.js b/packages/yoroi-extension/app/connector/components/layout/Layout.js
index f80423e5db..7d76c3c336 100644
--- a/packages/yoroi-extension/app/connector/components/layout/Layout.js
+++ b/packages/yoroi-extension/app/connector/components/layout/Layout.js
@@ -1,6 +1,7 @@
 // @flow
 import { Component } from 'react';
-import type { Node } from 'react';
+import type { Node, ComponentType } from 'react';
+import { withRouter, type Location } from 'react-router-dom';
 import { ReactComponent as YoroiLogo } from '../../assets/images/yoroi-logo.inline.svg';
 import styles from './Layout.scss';
 import { observer } from 'mobx-react';
@@ -9,25 +10,38 @@ import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
 import TestnetWarningBanner from '../../../components/topbar/banners/TestnetWarningBanner';
 import { ReactComponent as DappConnectorIcon } from '../../../assets/images/dapp-connector/dapp-connector.inline.svg';
 import environment from '../../../environment';
+import { ROUTES } from '../../routes-config';
 
 type Props = {|
   children: Node,
 |};
+type LocationProp = {|
+  location: Location,
+|};
 
-const messages = defineMessages({
+export const messages: Object = defineMessages({
   yoroiDappConnector: {
     id: 'global.connector.yoroiDappConnector',
     defaultMessage: '!!!Yoroi Dapp Connector',
   },
+  yoroiConnector: {
+    id: 'global.connector.yoroiConnector',
+    defaultMessage: '!!!Yoroi Connector',
+  },
 });
+
 @observer
-export default class Layout extends Component<Props> {
+class Layout extends Component<Props & LocationProp> {
   static contextTypes: {| intl: $npm$ReactIntl$IntlFormat |} = {
     intl: intlShape.isRequired,
   };
 
   render(): Node {
     const { intl } = this.context;
+    const title = intl.formatMessage(
+      this.props.location.pathname === ROUTES.SELECT_CASHBACK_WALLET ?
+        messages.yoroiConnector : messages.yoroiDappConnector
+    );
 
     return (
       <div className={styles.layout}>
@@ -36,7 +50,7 @@ export default class Layout extends Component<Props> {
           <div className={styles.menu}>
             <YoroiLogo />
             <div className={styles.logo}>
-              <h3>{intl.formatMessage(messages.yoroiDappConnector)}</h3>
+              <h3>{title}</h3>
             </div>
             <div className={styles.connectorLogoContainer}>
               <DappConnectorIcon className={styles.connectorLogo} />
@@ -48,3 +62,5 @@ export default class Layout extends Component<Props> {
     );
   }
 }
+
+export default (withRouter(Layout): ComponentType<Props>);
diff --git a/packages/yoroi-extension/app/connector/containers/SelectCashbackWalletContainer.js b/packages/yoroi-extension/app/connector/containers/SelectCashbackWalletContainer.js
new file mode 100644
index 0000000000..21ac3f0956
--- /dev/null
+++ b/packages/yoroi-extension/app/connector/containers/SelectCashbackWalletContainer.js
@@ -0,0 +1,52 @@
+// @flow
+import { Component, type Node } from 'react';
+import ConnectPage from '../components/connect/ConnectPage';
+import { observer } from 'mobx-react';
+import { genLookupOrFail } from '../../stores/stateless/tokenHelpers';
+import type { WalletState } from '../../../chrome/extension/background/types';
+import { setCashbackWallet } from '../../api/thunk';
+import type { ConnectorStoresProps } from '../stores';
+
+@observer
+export default class SelectCashbackWalletContainer extends Component<ConnectorStoresProps> {
+  componentDidMount() {
+    this.props.stores.connector.refreshWallets();
+  }
+
+  onCancel() {
+    window.close();
+  }
+
+  onSelectWallet(wallet: WalletState) {
+    setCashbackWallet(wallet.publicDeriverId);
+    // must delay or the message gets lost
+    setTimeout(window.close, 50);
+  }
+
+  render(): Node {
+    const { stores } = this.props;
+
+    return (
+      <ConnectPage
+        selectedWallet={{ index: -1, deriver: undefined, checksum: undefined }} // placeholder
+        onConnect={async () => {}} // placeholder
+        onCancel={this.onCancel}
+        isAppAuth={false} // na
+        hidePasswordForm={() => {}} // placeholder
+        loading={stores.connector.loadingWallets}
+        error={''} // na
+        message={null} // na
+        publicDerivers={stores.connector.wallets}
+        onSelectWallet={this.onSelectWallet}
+        network="Cardano"
+        getTokenInfo={genLookupOrFail(stores.tokenInfoStore.tokenInfo)}
+        shouldHideBalance={stores.profile.shouldHideBalance}
+        unitOfAccount={stores.profile.unitOfAccount}
+        getCurrentPrice={stores.coinPriceStore.getCurrentPrice}
+        onUpdateHideBalance={stores.profile.updateHideBalance}
+        isSelectingCashbackWallet
+      />
+    );
+  }
+}
+
diff --git a/packages/yoroi-extension/app/connector/routes-config.js b/packages/yoroi-extension/app/connector/routes-config.js
index f526f0ecc3..a602fb167e 100644
--- a/packages/yoroi-extension/app/connector/routes-config.js
+++ b/packages/yoroi-extension/app/connector/routes-config.js
@@ -2,4 +2,5 @@
 export const ROUTES = {
   ROOT: '/',
   SIGNIN_TRANSACTION: '/signin-transaction',
+  SELECT_CASHBACK_WALLET: '/select-cashback-wallet',
 };
diff --git a/packages/yoroi-extension/app/connector/stores/ConnectorStore.js b/packages/yoroi-extension/app/connector/stores/ConnectorStore.js
index e70731630a..8c1fcf6a38 100644
--- a/packages/yoroi-extension/app/connector/stores/ConnectorStore.js
+++ b/packages/yoroi-extension/app/connector/stores/ConnectorStore.js
@@ -27,6 +27,7 @@ import {
   getCardanoHaskellBaseConfig,
   getNetworkById,
   isCardanoHaskell,
+  networks,
 } from '../../api/ada/lib/storage/database/prepackaged/networks';
 import { MultiToken } from '../../api/common/lib/MultiToken';
 import { RustModule } from '../../api/ada/lib/cardanoCrypto/rustLoader';
@@ -382,7 +383,9 @@ export default class ConnectorStore extends Store<StoresMap> {
     });
 
     try {
-      const wallets = await getWallets();
+      const wallets = await getWallets(
+        this.stores.profile.currentNetworkId ?? networks.CardanoMainnet.NetworkId
+      );
 
       runInAction(() => {
         this.loadingWallets = LoadingWalletStates.SUCCESS;
diff --git a/packages/yoroi-extension/app/connector/stores/toplevel/ConnectorLoadingStore.js b/packages/yoroi-extension/app/connector/stores/toplevel/ConnectorLoadingStore.js
index 6185aff515..49c289d01f 100644
--- a/packages/yoroi-extension/app/connector/stores/toplevel/ConnectorLoadingStore.js
+++ b/packages/yoroi-extension/app/connector/stores/toplevel/ConnectorLoadingStore.js
@@ -7,18 +7,13 @@ import {
 
 export default class ConnectorLoadingStore extends BaseLoadingStore<StoresMap> {
 
-  async preLoadingScreenEnd(): Promise<void> {
-    await super.preLoadingScreenEnd();
+  async loadingEnd(): Promise<void> {
     // fixme ? wait for wallets loading
 
     await this.stores.tokenInfoStore.refreshTokenInfo();
     await this.stores.coinPriceStore.loadFromStorage();
   }
 
-  postLoadingScreenEnd(): void {
-    super.postLoadingScreenEnd();
-  }
-
   getTabIdKey(): string {
     return TabIdKeys.YoroiConnector;
   }
diff --git a/packages/yoroi-extension/app/containers/NavBarContainer.js b/packages/yoroi-extension/app/containers/NavBarContainer.js
deleted file mode 100644
index e00a83b0c9..0000000000
--- a/packages/yoroi-extension/app/containers/NavBarContainer.js
+++ /dev/null
@@ -1,143 +0,0 @@
-// @flow
-import moment from 'moment';
-import { Component } from 'react';
-import type { Node } from 'react';
-import { observer } from 'mobx-react';
-import { intlShape } from 'react-intl';
-import NavBar from '../components/topbar/NavBar';
-import NavPlate from '../components/topbar/NavPlate';
-import NavWalletDetails from '../components/topbar/NavWalletDetails';
-import NoWalletsDropdown from '../components/topbar/NoWalletsDropdown';
-import NavDropdown from '../components/topbar/NavDropdown';
-import NavDropdownRow from '../components/topbar/NavDropdownRow';
-import { ROUTES } from '../routes-config';
-import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
-import { genLookupOrFail } from '../stores/stateless/tokenHelpers';
-import BuySellDialog from '../components/buySell/BuySellDialog';
-import globalMessages from '../i18n/global-messages';
-import { MultiToken } from '../api/common/lib/MultiToken';
-import type { StoresProps } from '../stores';
-
-type LocalProps = {|
-  title: Node,
-|};
-
-@observer
-export default class NavBarContainer extends Component<{| ...StoresProps, ...LocalProps |}> {
-  static contextTypes: {| intl: $npm$ReactIntl$IntlFormat |} = {
-    intl: intlShape.isRequired,
-  };
-
-  updateHideBalance: void => Promise<void> = async () => {
-    await this.props.stores.profile.updateHideBalance();
-  };
-
-  switchToNewWallet: (number) => void = publicDeriverId => {
-    this.props.stores.app.goToRoute({
-      route: this.props.stores.app.currentRoute,
-      publicDeriverId,
-    });
-  };
-
-  openDialogWrapper: any => void = dialog => {
-    this.props.stores.app.goToRoute({ route: ROUTES.MY_WALLETS });
-    this.props.stores.uiDialogs.open({ dialog });
-  };
-
-  render(): Node {
-    const { intl } = this.context;
-    const { stores } = this.props;
-    const { profile, wallets: walletsStore } = stores;
-    const { wallets } = walletsStore;
-
-    const walletComponents = wallets.map(wallet => {
-      const rewards: MultiToken = this.props.stores.delegation.getRewardBalanceOrZero(wallet);
-      const { lastSyncInfo } = wallet;
-
-      return (
-        <NavDropdownRow
-          key={wallet.publicDeriverId}
-          plateComponent={<NavPlate plate={wallet.plate} walletType={wallet.type} name={wallet.name} />}
-          onSelect={() => this.switchToNewWallet(wallet.publicDeriverId)}
-          isCurrentWallet={wallet === stores.wallets.selected}
-          syncTime={lastSyncInfo?.Time ? moment(lastSyncInfo.Time).fromNow() : null}
-          detailComponent={
-            <NavWalletDetails
-              walletAmount={wallet.balance}
-              rewards={rewards}
-              onUpdateHideBalance={this.updateHideBalance}
-              shouldHideBalance={profile.shouldHideBalance}
-              getTokenInfo={genLookupOrFail(stores.tokenInfoStore.tokenInfo)}
-              defaultToken={stores.tokenInfoStore.getDefaultTokenInfo(
-                wallet.networkId
-              )}
-              showEyeIcon={false}
-              unitOfAccountSetting={profile.unitOfAccount}
-              getCurrentPrice={stores.coinPriceStore.getCurrentPrice}
-              purpose='allWallets'
-            />
-          }
-        />
-      );
-    });
-    const dropdownContent = (
-      <>
-        <NavDropdownRow
-          title={intl.formatMessage(globalMessages.allWalletsLabel)}
-          detailComponent={undefined}
-        />
-        {walletComponents}
-      </>
-    );
-
-    const dropdownComponent = (() => {
-      const getDropdownHead = () => {
-        const publicDeriver = walletsStore.selected;
-        if (publicDeriver == null) {
-          return <NoWalletsDropdown />;
-        }
-
-        const rewards: MultiToken = stores.delegation.getRewardBalanceOrZero(
-          publicDeriver
-        );
-
-        return (
-          <NavWalletDetails
-            onUpdateHideBalance={this.updateHideBalance}
-            shouldHideBalance={profile.shouldHideBalance}
-            rewards={rewards}
-            walletAmount={publicDeriver.balance}
-            getTokenInfo={genLookupOrFail(stores.tokenInfoStore.tokenInfo)}
-            defaultToken={stores.tokenInfoStore.getDefaultTokenInfo(
-              publicDeriver.networkId
-            )}
-            unitOfAccountSetting={profile.unitOfAccount}
-            getCurrentPrice={stores.coinPriceStore.getCurrentPrice}
-            purpose='topBar'
-          />
-        );
-      };
-
-      return (
-        <NavDropdown
-          headerComponent={getDropdownHead()}
-          contentComponents={dropdownContent}
-          onAddWallet={() =>
-            stores.app.goToRoute({ route: ROUTES.WALLETS.ADD })
-          }
-          openBuySellDialog={() => this.openDialogWrapper(BuySellDialog)}
-        />
-      );
-    })();
-
-    const getPlate = () => {
-      const { selected, selectedWalletName } = walletsStore;
-      if (selected == null || selectedWalletName == null) return null;
-      return <NavPlate plate={selected.plate} walletType={selected.type} name={selectedWalletName} />;
-    };
-
-    return (
-      <NavBar title={this.props.title} walletPlate={getPlate()} walletDetails={dropdownComponent} />
-    );
-  }
-}
diff --git a/packages/yoroi-extension/app/containers/NavBarContainerRevamp.js b/packages/yoroi-extension/app/containers/NavBarContainerRevamp.js
index 1620e603bc..bfac4266d8 100644
--- a/packages/yoroi-extension/app/containers/NavBarContainerRevamp.js
+++ b/packages/yoroi-extension/app/containers/NavBarContainerRevamp.js
@@ -6,7 +6,7 @@ import { intlShape } from 'react-intl';
 import { observer } from 'mobx-react';
 import { ROUTES } from '../routes-config';
 import { genLookupOrFail } from '../stores/stateless/tokenHelpers';
-import { getNetworkById } from '../api/ada/lib/storage/database/prepackaged/networks';
+import { networks, getNetworkById } from '../api/ada/lib/storage/database/prepackaged/networks';
 import { addressToDisplayString } from '../api/ada/lib/storage/bridge/utils';
 import BuySellDialog from '../components/buySell/BuySellDialog';
 import NavBarRevamp from '../components/topbar/NavBarRevamp';
@@ -16,8 +16,24 @@ import BuySellAdaButton from '../components/topbar/BuySellAdaButton';
 import { ampli } from '../../ampli/index';
 import { MultiToken } from '../api/common/lib/MultiToken';
 import LocalStorageApi from '../api/localStorage/index';
+import SwitchNetworkDialogContainer from './settings/categories/SwitchNetworkDialogContainer';
 import type { StoresProps } from '../stores';
 
+const NETWORK_BADGES = Object.freeze({
+  [networks.CardanoPreprodTestnet.NetworkId]: {
+    color: 'rgba(236, 186, 9, 1)',
+    text: 'preprod',
+  },
+  [networks.CardanoPreviewTestnet.NetworkId]: {
+    color: 'rgba(143, 201, 246, 1)',
+    text: 'preview',
+  },
+  [networks.CardanoSanchoTestnet.NetworkId]: {
+    color: 'rgba(147, 245, 225, 1)',
+    text: 'sancho',
+  },
+});
+
 type LocalProps = {|
   title: Node,
   menu?: Node,
@@ -53,8 +69,9 @@ export default class NavBarContainerRevamp extends Component<{| ...StoresProps,
     const isRewardWallet = delegation.isRewardWallet(newWalletId);
     const isStakingPage = app.currentRoute === ROUTES.STAKING;
     await localStorage.unsetPortfolioFiatPair();
+    this.props.stores.wallets.setActiveWallet({ publicDeriverId: newWalletId });
     const route = !isRewardWallet && isStakingPage ? ROUTES.WALLETS.ROOT : app.currentRoute;
-    this.props.stores.app.goToRoute({ route, publicDeriverId: newWalletId });
+    this.props.stores.app.goToRoute({ route });
   };
 
   checkAndResetGovRoutes: void => void = () => {
@@ -102,11 +119,38 @@ export default class NavBarContainerRevamp extends Component<{| ...StoresProps,
       );
     };
 
+    let title;
+    if (
+      this.props.stores.wallets.selected?.networkId === networks.CardanoMainnet.NetworkId ||
+      !this.props.stores.wallets.selected
+    ) {
+      title = this.props.title;
+    } else {
+      const { color, text } = NETWORK_BADGES[this.props.stores.wallets.selected.networkId];
+      title = (
+        <div style={{ display: 'flex', flexDirection: 'row' }}>
+          {this.props.title}
+          <button
+            style={{
+              backgroundColor: color,
+              marginLeft: '8px',
+              borderRadius: '16px',
+              paddingLeft: '8px',
+              paddingRight: '8px',
+            }}
+            onClick={() => stores.uiDialogs.open({ dialog: SwitchNetworkDialogContainer })}
+          >
+            {text}
+          </button>
+        </div>
+      );
+    }
+
     return (
       <>
         {this.getDialog()}
         <NavBarRevamp
-          title={this.props.title}
+          title={title}
           menu={this.props.menu}
           walletDetails={selected !== null ? <DropdownHead /> : null}
           buyButton={
@@ -127,28 +171,16 @@ export default class NavBarContainerRevamp extends Component<{| ...StoresProps,
     const shouldHideBalance = stores.profile.shouldHideBalance;
 
     if (stores.uiDialogs.isOpen(WalletListDialog)) {
-      const cardanoWallets = [];
-
-      wallets.forEach(wallet => {
-        const rewards = stores.delegation.getRewardBalanceOrZero(
-          wallet
-        );
-
-        const walletMap = {
-          walletId: wallet.publicDeriverId,
-          rewards,
-          amount: wallet.balance,
-          plate: wallet.plate,
-          type: wallet.type,
-          name: wallet.name,
-        };
-
-        cardanoWallets.push(walletMap);
-      });
-
       return (
         <WalletListDialog
-          cardanoWallets={cardanoWallets}
+          cardanoWallets={wallets.map(wallet => ({
+            walletId: wallet.publicDeriverId,
+            rewards: this.props.stores.delegation.getRewardBalanceOrZero(wallet),
+            amount: wallet.balance,
+            plate: wallet.plate,
+            type: wallet.type,
+            name: wallet.name,
+          }))}
           onSelect={wallet => {
             this.checkAndResetGovRoutes();
             this.onSelectWallet(wallet);
@@ -163,8 +195,9 @@ export default class NavBarContainerRevamp extends Component<{| ...StoresProps,
           getTokenInfo={getTokenInfo}
           walletAmount={selected?.balance}
           onAddWallet={this.addNewWallet}
-          updateSortedWalletList={stores.profile.updateSortedWalletList}
-          walletsNavigation={stores.profile.walletsNavigation}
+          onUpdateWalletListOrder={async (from, to) => {
+            await this.props.stores.wallets.reorderWallets(from, to);
+          }}
           unitOfAccountSetting={stores.profile.unitOfAccount}
           getCurrentPrice={stores.coinPriceStore.getCurrentPrice}
         />
@@ -194,6 +227,11 @@ export default class NavBarContainerRevamp extends Component<{| ...StoresProps,
       );
     }
 
+    if (this.props.stores.uiDialogs.isOpen(SwitchNetworkDialogContainer)) {
+      return <SwitchNetworkDialogContainer stores={this.props.stores} />;
+    }
+
     return null;
   };
+
 }
diff --git a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
new file mode 100644
index 0000000000..897d36f5ac
--- /dev/null
+++ b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
@@ -0,0 +1,564 @@
+// @flow
+import { useState, useEffect, useCallback, Suspense, useRef, useMemo } from 'react';
+import styles from './styles.module.css'
+import { observer } from 'mobx-react';
+import type { StoresProps } from '../../stores';
+import TopBarLayout from '../../components/layout/TopBarLayout';
+import BannerContainer from '../banners/BannerContainer';
+import SidebarContainer from '../SidebarContainer';
+import environment from '../../environment';
+import { ROUTES } from '../../routes-config';
+import NavBarContainerRevamp from '../NavBarContainerRevamp';
+import NavBarTitle from '../../components/topbar/NavBarTitle';
+import globalMessages from '../../i18n/global-messages';
+import { CoreAddressTypes } from '../../api/ada/lib/storage/database/primitives/enums';
+import { walletSignData, encodeHardwareWalletSignResult } from '../../api/ada';
+import { getPublicDeriverById } from '../../../chrome/extension/background/handlers/yoroi/utils';
+import Dialog from '../../components/widgets/Dialog';
+import DialogCloseButton from '../../components/widgets/DialogCloseButton';
+import { RustModule } from '../../api/ada/lib/cardanoCrypto/rustLoader';
+import {
+  useTheme,
+  Box,
+  TextField,
+  Typography,
+  DialogContentText
+} from '@mui/material';
+import { LedgerConnect } from '../../utils/hwConnectHandler';
+import { MessageAddressFieldType, AddressType } from '@cardano-foundation/ledgerjs-hw-app-cardano';
+import { WrongPassphraseError } from '../../api/ada/lib/cardanoCrypto/cryptoErrors';
+import { IncorrectWalletPasswordError } from '../../api/common/errors';
+import { convertToLocalizableError } from '../../domain/LedgerLocalizedError';
+import LocalizableError from '../../i18n/LocalizableError';
+import type { $npm$ReactIntl$IntlShape } from 'react-intl';
+import { injectIntl, defineMessages, } from 'react-intl';
+import { getNetworkById } from '../../api/ada/lib/storage/database/prepackaged/networks';
+import { forceNonNull } from '../../coreUtils';
+import { constructPlate32 } from '../../components/topbar/WalletCard';
+import LocalStorageApi from '../../api/localStorage';
+import DisclaimerDialog from '../../components/widgets/DisclaimerDialog';
+import type { BringConfigType, ConfigType } from '../../../config/config-types';
+
+const messages = defineMessages({
+  claim: {
+    id: 'cashback.claim.dialog.title',
+    defaultMessage: '!!!CLAIM CASHBACK',
+  },
+  passwordClaimInstruction: {
+    id: 'cashback.claim.dialog.instruction.password',
+    defaultMessage: '!!!Enter your password to claim cashback rewards.',
+  },
+  hardwardClaimInstruction: {
+    id: 'cashback.claim.dialog.instruction.hardware',
+    defaultMessage: '!!!Confirm on your hardware wallet to claim cashback rewards.',
+  },
+  message: {
+    id: 'cashback.claim.dialog.message.label',
+    defaultMessage: '!!!Message',
+  },
+  notCurrentText: {
+    id: 'cashback.not.current.warning.text',
+    defaultMessage: '!!!Your cashback rewards are currently linked to another wallet. To claim your ADA cashback, either switch to the rewards wallet or change the rewards wallet to the one you\'re using now. You can always access settings at anytime to change your cashback wallet and make claiming rewards relevant for you.',
+  },
+  currentWalletLabel: {
+    id: 'cashback.not.current.warning.current',
+    defaultMessage: '!!!Current rewards wallet'
+  },
+  warning: {
+    id: 'cashback.not.current.warning.title',
+    defaultMessage: '!!!WARNING',
+  },
+  useThis: {
+    id: 'cashback.not.current.warning.use.this',
+    defaultMessage: '!!!use this wallet',
+  },
+  keep: {
+    id: 'cashback.not.current.warning.keep',
+    defaultMessage: '!!!keep current wallet',
+  },
+  chooseTitle: {
+    id: 'cashback.not.current.warning.title.choose',
+    defaultMessage: '!!!wrong wallet',
+  },
+  setThis: {
+    id: 'cashback.not.current.warning.button.set.this',
+    defaultMessage: '!!!set this wallet',
+  },
+  switch: {
+    id: 'cashback.not.current.warning.button.switch',
+    defaultMessage: '!!!switch wallet',
+  },
+  chooseText1: {
+    id: 'cashback.not.current.warning.text.choose.1',
+    defaultMessage: '!!!Your cashback rewards are currently linked to another wallet.',
+  },
+  chooseText2: {
+    id: 'cashback.not.current.warning.text.choose.2',
+    defaultMessage: '!!!Switch wallet to access your rewards or set this wallet as your cashback wallet.',
+  },
+  setCurrentTitle: {
+    id: 'cashback.not.current.warning.title.set.current',
+    defaultMessage: '!!!Set my Current Wallet as my Cashback Wallet'
+  },
+  no: {
+    id: 'cashback.not.current.warning.button.no',
+    defaultMessage: '!!!no'
+  },
+  yes: {
+    id: 'cashback.not.current.warning.button.yes',
+    defaultMessage: '!!!yes'
+  },
+  switchText: {
+    id: 'cashback.not.current.warning.text.switch',
+    defaultMessage: '!!!You will no longer be able to claim rewards linked to your previous cashback wallet until you link it again.'
+  },
+});
+
+// populated by ConfigWebpackPlugin
+declare var CONFIG: ConfigType;
+
+type NotCurrentWalletModalProps = {|
+  onSetCurrentAsCashbackWallet: () => void,
+    onSwitchToCashbackWallet: () => void,
+      shownCashbackWallet: {
+  plate: {|
+    ImagePart: string,
+      TextPart: string,
+    |},
+  name: string,
+    ...,
+},
+intl: $npm$ReactIntl$IntlShape,
+|};
+
+const NotCurrentWalletModal = injectIntl(observer((props: NotCurrentWalletModalProps) => {
+  const { intl } = props;
+
+  const [state, setState] = useState < 'switchOrSet' | 'confirmSet' > ('switchOrSet');
+
+  if (state === 'switchOrSet') {
+    return (
+      <Dialog
+        title={intl.formatMessage(messages.chooseTitle)}
+        dialogActions={[
+          {
+            label: intl.formatMessage(messages.setThis),
+            onClick: () => {
+              setState('confirmSet');
+            }
+          },
+          {
+            label: intl.formatMessage(messages.switch),
+            primary: true,
+            onClick: props.onSwitchToCashbackWallet,
+          }
+        ]}
+      >
+        <Typography sx={{ fontSize: '16px', lineHeight: '24px' }}>
+          {intl.formatMessage(messages.chooseText1)}
+        </Typography>
+        <Typography sx={{ fontSize: '16px', lineHeight: '24px' }}>
+          {intl.formatMessage(messages.chooseText2)}
+        </Typography>
+      </Dialog>
+    );
+  }
+
+  return (
+    <Dialog
+      title={intl.formatMessage(messages.setCurrentTitle)}
+      dialogActions={[
+        {
+          label: intl.formatMessage(messages.no),
+          onClick: () => {
+            setState('switchOrSet');
+          }
+        },
+        {
+          label: intl.formatMessage(messages.yes),
+          primary: true,
+          onClick: props.onSetCurrentAsCashbackWallet,
+        }
+      ]}
+    >
+      <Typography sx={{ fontSize: '16px', lineHeight: '24px' }}>
+        {intl.formatMessage(messages.switchText)}
+      </Typography>
+      <Typography sx={{ fontSize: '12px', fontHeight: '16px', lineHeight: '16px' }}>
+        {intl.formatMessage(messages.currentWalletLabel)}
+      </Typography>
+      <Box sx={{ display: 'flex', flexDirection: 'row', overflow: 'hidden' }}>
+        {constructPlate32(props.shownCashbackWallet.plate)[1]}
+        <Typography
+          sx={{
+            fontWeight: '500px',
+            fontSize: '16px',
+            lineHeight: '24px',
+            marginTop: 'auto',
+            marginBottom: 'auto',
+            marginLeft: '1em',
+          }}
+        >
+          {props.shownCashbackWallet.plate.TextPart}
+        </Typography>
+      </Box>
+    </Dialog>
+  );
+}));
+
+type AllProps = {| ...StoresProps, intl: $npm$ReactIntl$IntlShape, |};
+
+type IframeMessageData = {|
+  action: string,
+    overlayBgColor ?: string,
+    messageToSign: string,
+      amount: number
+        |};
+
+const canUseSandbox = environment.isDev() || environment.isNightly();
+
+const CashbackPageContainer = observer((props: AllProps) => {
+  const {  stores, intl } = props;
+  const wallet = stores.wallets.selected;
+  if (!wallet) throw Error('no publicDeriver');
+
+  const theme = useTheme();
+
+  const iframeRef = useRef < HTMLIFrameElement | null > (null);
+  const [iframeSrc, setIframeSrc] = useState('');
+  const [popup, setPopup] = useState(false);
+  const [password, setPassword] = useState('')
+  const [errMsg, setErrMsg] = useState('')
+  const [message, setMessage] = useState('')
+  const [signaturePopup, setSignaturePopup] = useState(false);
+  const [overlayBgColor, setOverlayBgColor] = useState('#000000fa');
+
+  const bringSandboxRequest = stores.profile.getBringSandboxRequest;
+  const isBringSandbox: ?boolean = useMemo(
+    () => canUseSandbox && bringSandboxRequest.result,
+    [bringSandboxRequest.result],
+  );
+
+
+  const fetchIframeUrl = useCallback(async () => {
+
+    const bringConfig: BringConfigType = isBringSandbox ? CONFIG.bringSandbox : CONFIG.bring;
+
+    try {
+      const publicDeriver = stores.wallets.selected;
+      if (!publicDeriver) throw Error('no publicDeriver');
+      const walletAddress = RustModule.WalletV4.Address.from_hex(
+        publicDeriver.externalAddressesByType[CoreAddressTypes.CARDANO_BASE][0].address
+      ).to_bech32();
+
+      const response = await fetch(`${bringConfig.baseUrl}check/portal`, {
+        method: 'POST',
+        headers: {
+          'x-api-key': bringConfig.identifier,
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({ walletAddress }),
+      });
+      const data = await response.json();
+      const url = new URL(data.iframeUrl);
+      url.searchParams.set('token', data.token);
+      url.searchParams.set('theme', theme.name.split('-')[0]);
+
+      setIframeSrc(url.href);
+    } catch (error) {
+      console.error('Error fetching data:', error);
+    }
+  }, [stores.wallets.selected, isBringSandbox]);
+
+  function stringToHex(str) {
+    return Array.from(str)
+      .map(char => char.charCodeAt(0).toString(16).padStart(2, '0'))
+      .join('');
+  }
+
+  const signMessage = useCallback(async (msg: string, pwd: string) => {
+    const { address, addressing } = wallet.externalAddressesByType[CoreAddressTypes.CARDANO_BASE][0];
+
+    try {
+      let res;
+      if (wallet.type === 'mnemonic') {
+        const publicDeriver = await getPublicDeriverById(wallet.publicDeriverId)
+        try {
+          res = await walletSignData(publicDeriver, pwd, address, stringToHex(msg))
+        } catch (error) {
+          if (error instanceof WrongPassphraseError) {
+            throw new IncorrectWalletPasswordError();
+          }
+          throw error;
+        }
+      } else if (wallet.type === 'ledger') {
+        const ledgerConnect = new LedgerConnect({
+          locale: stores.profile.currentLocale,
+        });
+        try {
+          const network = getNetworkById(wallet.networkId);
+          const config = network.BaseConfig[0];
+          const messageHex = stringToHex(msg);
+          const hashPayload = true;
+          const { signatureHex, signingPublicKeyHex, addressFieldHex } = await ledgerConnect.signMessage({
+            serial: null,
+            params: {
+              preferHexDisplay: false,
+              messageHex,
+              signingPath: addressing.path,
+              hashPayload,
+              addressFieldType: MessageAddressFieldType.ADDRESS,
+              address: {
+                type: AddressType.BASE_PAYMENT_KEY_STAKE_KEY,
+                params: {
+                  spendingPath: addressing.path,
+                  stakingPath: wallet.stakingAddressing.addressing.path,
+                },
+              },
+              network: {
+                protocolMagic: config.ByronNetworkId,
+                networkId: Number(config.ChainNetworkId),
+              },
+            },
+          });
+          res = await encodeHardwareWalletSignResult(
+            addressFieldHex,
+            signatureHex,
+            messageHex,
+            signingPublicKeyHex,
+            hashPayload,
+          );
+        } catch (error) {
+          throw new convertToLocalizableError(error);
+        }
+      } else {
+        throw new Error('unsupported wallet type');
+      }
+      iframeRef.current?.contentWindow.postMessage(
+        {
+          to: 'bringweb3',
+          action: 'SIGNATURE',
+          ...res,
+          message: msg,
+          address
+        },
+        '*'
+      );
+      setSignaturePopup(false);
+      setPassword('');
+    } catch (error) {
+      setErrMsg(error instanceof LocalizableError ? intl.formatMessage(error) : error.message)
+      // console.warn(error);
+    }
+  }, []);
+
+  const handleMessage = useCallback(async (event: MessageEvent) => {
+    const iframeOrigin = new URL(iframeSrc).origin;
+
+    if (event.origin !== iframeOrigin) {
+      return;
+    }
+
+    const messageData: IframeMessageData = (event.data: any);
+
+  if (messageData.action === 'SIGN_MESSAGE') {
+    setMessage(messageData.messageToSign)
+    setSignaturePopup(true)
+  } else if (messageData.action === 'POPUP_OPENED') {
+    setPopup(true);
+    setOverlayBgColor(messageData.overlayBgColor || overlayBgColor);
+  } else if (messageData.action === 'POPUP_CLOSED') {
+    setPopup(false);
+  }
+}, [iframeSrc, overlayBgColor]);
+
+useEffect(() => {
+  if (environment.isLight) {
+    stores.app.goToRoute({
+      route: ROUTES.WALLETS.ROOT,
+    });
+  }
+  if (!iframeSrc) fetchIframeUrl();
+
+  window.addEventListener('message', handleMessage);
+
+  return () => {
+    window.removeEventListener('message', handleMessage);
+  };
+}, [iframeSrc, fetchIframeUrl, handleMessage]);
+
+// If the current cashback wallet is not the current wallet, this value initially holds the current cashback
+// wallet, to be shown in a warning dialog.
+const [shownCashbackWallet, setShownCashbackWallet] = useState(null);
+
+useEffect(() => {
+  stores.wallets.getCashbackWalletRequest.execute().then((currentCashbackWallet) => {
+    if (currentCashbackWallet && currentCashbackWallet !== stores.wallets.selected) {
+      setShownCashbackWallet(currentCashbackWallet);
+      setPopup(true);
+    }
+    return 'nonsense';
+  }).catch(console.error);
+}, []);
+
+const [shouldShowDisclaimer, setShouldShowDisclaimer] = useState(false);
+
+useEffect(() => {
+  const localStorageApi = new LocalStorageApi();
+  localStorageApi.isDisclaimerShown('cashback').then((result) => {
+    if (!result) {
+      setShouldShowDisclaimer(true);
+      setPopup(true);
+    }
+    return 'nonsense';
+  }).catch(console.error);
+}, []);
+
+const closePopup = useCallback(() => {
+  iframeRef.current?.contentWindow.postMessage({ to: 'bringweb3', action: 'CLOSE_POPUP' }, '*');
+  setPopup(false);
+}, []);
+
+const abortClaim = useCallback(() => {
+  iframeRef.current?.contentWindow.postMessage({ to: 'bringweb3', action: 'ABORT_SIGN_MESSAGE' }, '*');
+  setSignaturePopup(false)
+  setPassword('')
+  setErrMsg('')
+}, []);
+
+const sidebarContainer = <SidebarContainer stores={stores} />;
+
+return (
+  <TopBarLayout
+    banner={<BannerContainer stores={stores} />}
+    sidebar={sidebarContainer}
+    navbar={
+      <NavBarContainerRevamp
+        stores={stores}
+        title={<NavBarTitle title={intl.formatMessage(globalMessages.sidebarCashback) + (
+          isBringSandbox ? ' (sandbox)' : ''
+        )} />}
+      />
+    }
+  >
+    <Suspense fallback={null}>
+      {shouldShowDisclaimer && (
+        <DisclaimerDialog
+          onProceed={() => {
+            setShouldShowDisclaimer(false);
+            if (!shownCashbackWallet) {
+              setPopup(false);
+            }
+            const localStorageApi = new LocalStorageApi();
+            localStorageApi.setShownDisclaimer('cashback');
+          }}
+        />
+      )}
+
+      {shownCashbackWallet && !shouldShowDisclaimer && (
+        <NotCurrentWalletModal
+          shownCashbackWallet={shownCashbackWallet}
+          onSetCurrentAsCashbackWallet={() => {
+            stores.wallets.setCashbackWallet(forceNonNull(stores.wallets.selected).publicDeriverId);
+            setShownCashbackWallet(null);
+            setPopup(false);
+          }}
+          onSwitchToCashbackWallet={() => {
+            stores.wallets.setActiveWallet(
+              { publicDeriverId: shownCashbackWallet.publicDeriverId }
+            );
+          }}
+        />
+      )}
+
+      {signaturePopup ?
+        <Dialog
+          title={intl.formatMessage(messages.claim)}
+          closeOnOverlayClick
+          closeButton={<DialogCloseButton />}
+          onClose={abortClaim}
+          dialogActions={[{
+            label: intl.formatMessage(globalMessages.confirm),
+            primary: true,
+            disabled: wallet.type === 'mnemonic' && !password,
+            onClick: () => signMessage(message, password)
+          }]}
+        >
+          <Box>
+            <Typography
+              sx={{
+                marginBottom: '16px',
+                color: theme.name === 'light-theme' ? '#242838' : '#E1E6F5'
+              }}
+            >
+              {intl.formatMessage(wallet.type === 'mnemonic' ?
+                messages.passwordClaimInstruction : messages.hardwardClaimInstruction
+              )}
+            </Typography>
+            <Typography sx={{ color: theme.name === 'light-theme' ? '#6B7384' : '#7C85A3' }}>
+              {intl.formatMessage(messages.message)}
+            </Typography>
+            <DialogContentText sx={{
+              whiteSpace: 'pre-wrap', wordBreak: 'break-word', color: theme.name === 'light-theme' ? '#242838' : '#E1E6F5'
+            }}>
+              {message}
+            </DialogContentText>
+            {wallet.type === 'mnemonic' && (
+              <TextField
+                className="walletPassword"
+                value={password}
+                label="Password"
+                type="password"
+                // endAdornment={
+                //   <InputAdornment position="end">
+                //     <IconButton
+                //       aria-label="toggle password visibility"
+                //       onClick={() => setShowPassword(!showPassword)}
+                //       edge="end"
+                //     >
+                //       {!showPassword ? <Icon.VisibilityOff /> : <Icon.VisibilityOn />}
+                //     </IconButton>
+                //   </InputAdornment>
+                // }
+                onChange={e => {
+                  setPassword(e.target.value);
+                }}
+                error={!!errMsg}
+                disabled={false}
+              />
+            )}
+            <Typography color="ds.text_error">
+              {errMsg}
+            </Typography>
+          </Box>
+        </Dialog>
+        : null}
+
+      {popup ? (
+        // eslint-disable-next-line
+        <div
+          className={styles.iframe_overlay}
+          style={{ background: overlayBgColor }}
+          onClick={closePopup}
+        />
+      ) : null}
+
+      {iframeSrc && (
+        <iframe
+          title="cashback"
+          ref={iframeRef}
+          id="bringweb3"
+          className={styles.iframe}
+          src={iframeSrc}
+          style={{ verticalAlign: 'bottom' }}
+          width="100%"
+          height="100%"
+        />
+      )}
+    </Suspense>
+
+  </TopBarLayout >
+);
+});
+
+export default (injectIntl(CashbackPageContainer): React$ComponentType <StoresProps>);
diff --git a/packages/yoroi-extension/app/containers/cashback/styles.module.css b/packages/yoroi-extension/app/containers/cashback/styles.module.css
new file mode 100644
index 0000000000..790b4c8281
--- /dev/null
+++ b/packages/yoroi-extension/app/containers/cashback/styles.module.css
@@ -0,0 +1,44 @@
+.overlay{
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    position: fixed;
+    inset: 0;
+    background: #00000031;
+    z-index: 12;
+}
+
+.popup{
+    position: relative;
+    display: flex;
+    gap: 8px;
+    flex-direction: column;
+    align-items: center;
+    height: 400px;
+    width: 480px;
+    background: white;
+    border-radius: 8px;
+    padding: 16px;
+}
+
+.close_btn{
+    position: absolute;
+    top: 16px;
+    right: 16px;
+}
+
+.form{
+    display: flex;
+    flex-direction: column;
+}
+
+.iframe_overlay{
+    position: fixed;
+    inset: 0;
+    z-index: 10;
+}
+
+.iframe{
+    position: relative;
+    z-index: 11;
+}
\ No newline at end of file
diff --git a/packages/yoroi-extension/app/containers/dapp-connector/ConnectedWebsitesContainer.js b/packages/yoroi-extension/app/containers/dapp-connector/ConnectedWebsitesContainer.js
index 2ea405f85e..c9e2a2fd92 100644
--- a/packages/yoroi-extension/app/containers/dapp-connector/ConnectedWebsitesContainer.js
+++ b/packages/yoroi-extension/app/containers/dapp-connector/ConnectedWebsitesContainer.js
@@ -9,8 +9,6 @@ import BannerContainer from '../banners/BannerContainer';
 import SidebarContainer from '../SidebarContainer';
 import { genLookupOrFail } from '../../stores/stateless/tokenHelpers';
 import FullscreenLayout from '../../components/layout/FullscreenLayout';
-import environment from '../../environment';
-import { ROUTES } from '../../routes-config';
 import NavBarContainerRevamp from '../NavBarContainerRevamp';
 import NavBarTitle from '../../components/topbar/NavBarTitle';
 import { connectorMessages } from '../../i18n/global-messages';
@@ -27,12 +25,6 @@ export default class ConnectedWebsitesPageContainer extends Component<StoresProp
   };
 
   async componentDidMount() {
-    // User should not be able to access the route when using Yoroi Light
-    if (environment.isLight) {
-      this.props.stores.app.goToRoute({
-        route: ROUTES.MY_WALLETS,
-      });
-    }
     await this.props.stores.connector.refreshActiveSites();
     await this.props.stores.connector.getConnectorWhitelist();
   }
diff --git a/packages/yoroi-extension/app/containers/settings/categories/GeneralSettingsPage.js b/packages/yoroi-extension/app/containers/settings/categories/GeneralSettingsPage.js
index f7c28dcad4..df77e656dd 100644
--- a/packages/yoroi-extension/app/containers/settings/categories/GeneralSettingsPage.js
+++ b/packages/yoroi-extension/app/containers/settings/categories/GeneralSettingsPage.js
@@ -7,12 +7,16 @@ import GeneralSettings from '../../../components/settings/categories/general-set
 import ThemeSettingsBlock from '../../../components/settings/categories/general-setting/ThemeSettingsBlock';
 import AboutYoroiSettingsBlock from '../../../components/settings/categories/general-setting/AboutYoroiSettingsBlock';
 import UnitOfAccountSettings from '../../../components/settings/categories/general-setting/UnitOfAccountSettings';
+import BringCashbackSettings from '../../../components/settings/categories/general-setting/BringCashbackSettings';
 import { ReactComponent as AdaCurrency } from '../../../assets/images/currencies/ADA.inline.svg';
 import { unitOfAccountDisabledValue } from '../../../types/unitOfAccountType';
 import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
 import { Box, Typography } from '@mui/material';
 import { settingsMenuMessages } from '../../../components/settings/menu/SettingsMenu';
 import LocalStorageApi from '../../../api/localStorage/index';
+import environment from '../../../environment';
+import SwitchNetworkDialogContainer from './SwitchNetworkDialogContainer';
+
 import type { StoresProps } from '../../../stores';
 
 const currencyLabels = defineMessages({
@@ -50,12 +54,20 @@ const currencyLabels = defineMessages({
   },
 });
 
+const canUseSandbox = environment.isDev() || environment.isNightly();
+
 @observer
 export default class GeneralSettingsPage extends Component<StoresProps> {
   static contextTypes: {| intl: $npm$ReactIntl$IntlFormat |} = {
     intl: intlShape.isRequired,
   };
 
+  componentDidMount() {
+    const request = this.props.stores.wallets.getCashbackWalletRequest;
+    request.reset();
+    request.execute();
+  }
+
   onSelectUnitOfAccount: string => Promise<void> = async value => {
     const localStorageApi = new LocalStorageApi();
 
@@ -65,11 +77,16 @@ export default class GeneralSettingsPage extends Component<StoresProps> {
     await this.props.stores.transactions.updateUnitOfAccount();
   };
 
+  onSelectBringCashbackWallet: number => Promise<void> = async value => {
+    this.props.stores.wallets.setCashbackWallet(value);
+  };
+
   render(): Node {
     const { intl } = this.context;
     const { stores } = this.props;
     const profileStore = stores.profile;
     const coinPriceStore = stores.coinPriceStore;
+    const { wallets, getCashbackWalletRequest } = stores.wallets;
 
     const isSubmittingLocale = profileStore.setProfileLocaleRequest.isExecuting;
     const isSubmittingUnitOfAccount = profileStore.setUnitOfAccountRequest.isExecuting;
@@ -106,6 +123,20 @@ export default class GeneralSettingsPage extends Component<StoresProps> {
           currentLocale={profileStore.currentLocale}
           error={profileStore.setProfileLocaleRequest.error}
         />
+        <BringCashbackSettings
+          onSelect={this.onSelectBringCashbackWallet}
+          isSubmitting={false}
+          // $FlowFixMe this is apparently correct, flow is out of its mind
+          cardanoWallets={wallets.filter(w=>w.type !== 'trezor')}
+          // $FlowFixMe this is apparently correct, flow is out of its mind
+          currentValue={getCashbackWalletRequest.result?.publicDeriverId || ''}
+          isUseSandbox={profileStore.getBringSandboxRequest.result}
+          onSetUseSandbox={canUseSandbox ? (async (useSandbox) => {
+            await profileStore.setBringSandboxRequest.execute(useSandbox);
+            await profileStore.getBringSandboxRequest.execute();
+          }) : null}
+          error={null}
+        />
         <UnitOfAccountSettings
           onSelect={this.onSelectUnitOfAccount}
           isSubmitting={isSubmittingUnitOfAccount}
@@ -115,7 +146,22 @@ export default class GeneralSettingsPage extends Component<StoresProps> {
           lastUpdatedTimestamp={coinPriceStore.lastUpdateTimestamp}
         />
         <ThemeSettingsBlock />
-        <AboutYoroiSettingsBlock wallet={stores.wallets.selected} />
+        <AboutYoroiSettingsBlock
+          wallet={stores.wallets.selected}
+          onSwitchNetwork={() =>
+            stores.uiDialogs.open({
+              dialog: SwitchNetworkDialogContainer,
+            })
+          }
+        />
+        {/* pop up dialogs */}
+        {
+          stores.uiDialogs.isOpen(SwitchNetworkDialogContainer) && (
+            <SwitchNetworkDialogContainer
+              stores={stores}
+            />
+          )
+        }
       </Box>
     );
   }
diff --git a/packages/yoroi-extension/app/containers/settings/categories/OAuthDropboxPage.js b/packages/yoroi-extension/app/containers/settings/categories/OAuthDropboxPage.js
deleted file mode 100644
index 99a597e147..0000000000
--- a/packages/yoroi-extension/app/containers/settings/categories/OAuthDropboxPage.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// @flow
-import type { Node } from 'react';
-import { Component } from 'react';
-import { Redirect } from 'react-router-dom';
-import { observer } from 'mobx-react';
-import { ExternalStorageList } from '../../../domain/ExternalStorage';
-import type { StoresProps } from '../../../stores';
-
-type Props = {|
-  match: {|
-    params: {|
-      token: string,
-      token_type: string,
-      uid: string,
-      account_id: string,
-    |}
-  |},
-|};
-
-@observer
-export default class OAuthDropboxPage extends Component<{| ...Props, ...StoresProps |}> {
-
-  onLoad: string => Promise<void> = async (token) => {
-    await this.props.stores.memos.setExternalStorageProvider({
-      provider: ExternalStorageList.DROPBOX,
-      token,
-    });
-  };
-
-  async componentDidMount() {
-    const { token } = this.props.match.params;
-    await this.onLoad(token);
-  }
-
-  render(): Node {
-    // URL params
-    return (
-      <Redirect to="/settings/external-storage" />
-    );
-  }
-}
diff --git a/packages/yoroi-extension/app/containers/settings/categories/RemoveWalletDialogContainer.js b/packages/yoroi-extension/app/containers/settings/categories/RemoveWalletDialogContainer.js
index 6916f71a72..b4bf63e456 100644
--- a/packages/yoroi-extension/app/containers/settings/categories/RemoveWalletDialogContainer.js
+++ b/packages/yoroi-extension/app/containers/settings/categories/RemoveWalletDialogContainer.js
@@ -3,7 +3,7 @@ import type { Node } from 'react';
 import { Component } from 'react';
 import { action, observable } from 'mobx';
 import { observer } from 'mobx-react';
-import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
+import type { $npm$ReactIntl$IntlFormat, $npm$ReactIntl$MessageDescriptor } from 'react-intl';
 import { defineMessages, intlShape } from 'react-intl';
 import globalMessages from '../../../i18n/global-messages';
 import { messages } from '../../../components/wallet/settings/RemoveWallet';
@@ -17,6 +17,12 @@ type Props = {|
 |};
 type AllProps = {| ...Props, ...StoresProps |};
 
+type State = {|
+  warning1Text: ?$npm$ReactIntl$MessageDescriptor,
+  warning2Text: ?$npm$ReactIntl$MessageDescriptor,
+  acceptText: ?$npm$ReactIntl$MessageDescriptor,
+|};
+
 const dialogMessages = defineMessages({
   warning2: {
     id: 'wallet.settings.delete.warning2',
@@ -28,10 +34,28 @@ const dialogMessages = defineMessages({
     id: 'wallet.settings.delete.accept',
     defaultMessage: '!!!I still have the means to restore this wallet',
   },
+  cashbackWarning1: {
+    id: 'wallet.settings.delete.warning1.cashback',
+    defaultMessage: '!!!Removing this wallet will not impact its balance, but as it is the rewards wallet, this may disrupt your cashback process. You can also use another wallet for connecting the cashback before removing this wallet.'
+  },
+  cashbackWarning2: {
+    id: 'wallet.settings.delete.warning2.cashback',
+    defaultMessage: '!!!This wallet can be restored again at any time, but double-check if you still have the means to restore access to it. If you cannot, removing the wallet may result in irreversible loss of funds.'
+  },
+  cashbackAccept: {
+    id: 'wallet.settings.delete.accept.cashback',
+    defaultMessage: '!!!I still have the means to restore this wallet and want to stop generating cashback rewards for this wallet.'
+  },
 });
 
 @observer
-export default class RemoveWalletDialogContainer extends Component<AllProps> {
+export default class RemoveWalletDialogContainer extends Component<AllProps, State> {
+  state: State = {
+    warning1Text: null,
+    warning2Text: null,
+    acceptText: null,
+  }
+
   static contextTypes: {| intl: $npm$ReactIntl$IntlFormat |} = {
     intl: intlShape.isRequired,
   };
@@ -40,6 +64,23 @@ export default class RemoveWalletDialogContainer extends Component<AllProps> {
     this.props.stores.walletSettings.removeWalletRequest.reset();
   }
 
+  async componentDidMount() {
+    const { wallets } = this.props.stores;
+    if (await wallets.getCashbackWallet() === wallets.selected) {
+      this.setState({
+        warning1Text: dialogMessages.cashbackWarning1,
+        warning2Text: dialogMessages.cashbackWarning2,
+        acceptText: dialogMessages.cashbackAccept,
+      });
+    } else {
+      this.setState({
+        warning1Text: messages.removeExplanation,
+        warning2Text: dialogMessages.warning2,
+        acceptText: dialogMessages.accept,
+      });
+    }
+  }
+
   @observable isChecked: boolean = false;
 
   @action
@@ -49,18 +90,7 @@ export default class RemoveWalletDialogContainer extends Component<AllProps> {
   };
 
   removeWalletRevamp: void => Promise<void> = async () => {
-    const { stores } = this.props;
-    const selectedWalletId = this.props.publicDeriverId;
-    const walletsNavigation = stores.profile.walletsNavigation;
-
-    const newWalletsNavigation = {
-      ...walletsNavigation,
-      // $FlowFixMe[invalid-computed-prop]
-      cardano: walletsNavigation.cardano.filter(walletId => walletId !== selectedWalletId),
-    };
-    await stores.profile.updateSortedWalletList(newWalletsNavigation);
-
-    stores.walletSettings.removeWallet({
+    this.props.stores.walletSettings.removeWallet({
       publicDeriverId: this.props.publicDeriverId,
     });
   };
@@ -68,10 +98,16 @@ export default class RemoveWalletDialogContainer extends Component<AllProps> {
   render(): Node {
     const { intl } = this.context;
     const settingsStore = this.props.stores.walletSettings;
+
+    const { warning1Text, warning2Text, acceptText } = this.state;
+    if (!warning1Text || !warning2Text || !acceptText) {
+      return null;
+    }
+
     return (
       <DangerousActionDialog
         title={intl.formatMessage(messages.titleLabel)}
-        checkboxAcknowledge={intl.formatMessage(dialogMessages.accept)}
+        checkboxAcknowledge={intl.formatMessage(acceptText)}
         isChecked={this.isChecked}
         toggleCheck={this.toggleCheck}
         isSubmitting={settingsStore.removeWalletRequest.isExecuting}
@@ -87,11 +123,11 @@ export default class RemoveWalletDialogContainer extends Component<AllProps> {
         id="removeWalletDialog"
       >
         <Typography varint="body1" sx={{ color: 'ds.text_gray_medium' }}>
-          {intl.formatMessage(messages.removeExplanation)}
+          {intl.formatMessage(warning1Text)}
         </Typography>
         <Typography varint="body1" sx={{ color: 'ds.text_gray_medium' }}>
           {' '}
-          {intl.formatMessage(dialogMessages.warning2)}
+          {intl.formatMessage(warning2Text)}
         </Typography>
       </DangerousActionDialog>
     );
diff --git a/packages/yoroi-extension/app/containers/settings/categories/SwitchNetworkDialogContainer.js b/packages/yoroi-extension/app/containers/settings/categories/SwitchNetworkDialogContainer.js
new file mode 100644
index 0000000000..d4ea8f9e70
--- /dev/null
+++ b/packages/yoroi-extension/app/containers/settings/categories/SwitchNetworkDialogContainer.js
@@ -0,0 +1,47 @@
+// @flow
+import type { Node } from 'react';
+import type { StoresProps } from '../../../stores';
+import { Component } from 'react';
+import { observer } from 'mobx-react';
+import SwitchNetworkDialog from '../../../components/wallet/settings/SwitchNetworkDialog';
+import { networks } from '../../../api/ada/lib/storage/database/prepackaged/networks';
+import globalMessages from '../../../i18n/global-messages';
+
+type Props = {|
+  ...StoresProps,
+|};
+
+const networkNames = Object.freeze({
+  CardanoMainnet: globalMessages.mainnet,
+  CardanoPreprodTestnet: globalMessages.preprod,
+  CardanoPreviewTestnet: globalMessages.preview,
+  CardanoSanchoTestnet: globalMessages.sancho,
+});
+// type assertion to ensure we have all names:
+(networks: {| [$Keys<typeof networkNames>]: any |});
+
+@observer
+export default class SwitchNetworkDialogContainer extends Component<Props> {
+  render(): Node {
+    const profileStore = this.props.stores.profile;
+
+    return (
+      <SwitchNetworkDialog
+        onCancel={() => {
+          this.props.stores.uiDialogs.closeActiveDialog();
+        }}
+        onApply={async (networkId) => {
+          if (networkId !== profileStore.getCurrentNetworkId()) {
+            await profileStore.setCurrentNetworkId(networkId);
+            window.location.reload();
+          }
+        }}
+        networks={Object.keys(networks).map(network => ({
+          id: networks[network].NetworkId,
+          name: networkNames[network],
+        }))}
+        currentNetworkId={profileStore.getCurrentNetworkId()}
+      />
+    );
+  }
+}
diff --git a/packages/yoroi-extension/app/containers/uri/URILandingDialogContainer.js b/packages/yoroi-extension/app/containers/uri/URILandingDialogContainer.js
index af8b8c9707..2d1f3f20b8 100644
--- a/packages/yoroi-extension/app/containers/uri/URILandingDialogContainer.js
+++ b/packages/yoroi-extension/app/containers/uri/URILandingDialogContainer.js
@@ -46,11 +46,7 @@ export default class URILandingDialogContainer extends Component<Props> {
         <URIInvalidDialog
           onClose={this.onCancel}
           onSubmit={this.onCancel}
-          address={
-            this.props.stores.loading.uriParams
-              ? this.props.stores.loading.uriParams.address
-              : null
-          }
+          address={this.props.stores.loading.uriParams?.address || null}
         />
       );
     }
diff --git a/packages/yoroi-extension/app/containers/uri/URILandingPage.js b/packages/yoroi-extension/app/containers/uri/URILandingPage.js
index c2f9c24666..45a8196196 100644
--- a/packages/yoroi-extension/app/containers/uri/URILandingPage.js
+++ b/packages/yoroi-extension/app/containers/uri/URILandingPage.js
@@ -19,10 +19,7 @@ export default class URILandingPage extends Component<StoresProps> {
 
   onConfirm: void => void = () => {
     // this will automatically reroute to the right page if no wallet exists
-    this.props.stores.app.goToRoute({
-      route: ROUTES.WALLETS.SEND,
-      publicDeriverId: this.firstSelectedWalletId(),
-    });
+    this.props.stores.app.goToRoute({ route: ROUTES.WALLETS.SEND });
   };
 
   render(): Node {
diff --git a/packages/yoroi-extension/app/containers/wallet/AddWalletPage.js b/packages/yoroi-extension/app/containers/wallet/AddWalletPage.js
index 92ad654f3a..9420a30c95 100644
--- a/packages/yoroi-extension/app/containers/wallet/AddWalletPage.js
+++ b/packages/yoroi-extension/app/containers/wallet/AddWalletPage.js
@@ -5,7 +5,6 @@ import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
 import { intlShape } from 'react-intl';
 import { observer } from 'mobx-react';
 import { ROUTES } from '../../routes-config';
-import { networks } from '../../api/ada/lib/storage/database/prepackaged/networks';
 import { Box } from '@mui/material';
 import TopBarLayout from '../../components/layout/TopBarLayout';
 import BannerContainer from '../banners/BannerContainer';
@@ -13,7 +12,6 @@ import WalletCreateDialogContainer from './dialogs/WalletCreateDialogContainer';
 import WalletCreateDialog from '../../components/wallet/WalletCreateDialog';
 import WalletBackupDialogContainer from './dialogs/WalletBackupDialogContainer';
 import WalletBackupDialog from '../../components/wallet/WalletBackupDialog';
-import PickCurrencyDialogContainer from './dialogs/PickCurrencyDialogContainer';
 import WalletRestoreOptionDialogContainer from './dialogs/WalletRestoreOptionDialogContainer';
 import WalletRestoreDialogContainer from './dialogs/WalletRestoreDialogContainer';
 import WalletRestoreOptionDialog from '../../components/wallet/add/option-dialog/WalletRestoreOptionDialog';
@@ -40,12 +38,6 @@ export default class AddWalletPage extends Component<StoresProps> {
   };
 
   openDialogWrapper: any => void = dialog => {
-    // we reset the API when we open a dialog instead of when we close a dialog
-    // this is because on close, asynchronous unmount actions get triggered
-    // so there is no safe time at which we can un-select the API
-    // so instead, the API gets reset before we start any dialog flow
-    this.props.stores.profile.setSelectedNetwork(undefined);
-
     this.props.stores.uiDialogs.open({ dialog });
   };
 
@@ -76,23 +68,7 @@ export default class AddWalletPage extends Component<StoresProps> {
     };
 
     let activeDialog = null;
-    if (uiDialogs.hasOpen && selectedNetwork == null) {
-      activeDialog = (
-        <PickCurrencyDialogContainer
-          onClose={this.onClose}
-          onCardano={() => stores.profile.setSelectedNetwork(networks.CardanoMainnet)}
-          onCardanoPreprodTestnet={() =>
-            stores.profile.setSelectedNetwork(networks.CardanoPreprodTestnet)
-          }
-          onCardanoPreviewTestnet={() =>
-            stores.profile.setSelectedNetwork(networks.CardanoPreviewTestnet)
-          }
-          onCardanoSanchoTestnet={() =>
-            stores.profile.setSelectedNetwork(networks.CardanoSanchoTestnet)
-          }
-        />
-      );
-    } else if (uiDialogs.isOpen(WalletCreateDialog)) {
+    if (uiDialogs.isOpen(WalletCreateDialog)) {
       activeDialog = (
         <WalletCreateDialogContainer
           stores={stores}
diff --git a/packages/yoroi-extension/app/containers/wallet/CreateWalletPageContainer.js b/packages/yoroi-extension/app/containers/wallet/CreateWalletPageContainer.js
index 3cbc5cf3be..523e7e5a3f 100644
--- a/packages/yoroi-extension/app/containers/wallet/CreateWalletPageContainer.js
+++ b/packages/yoroi-extension/app/containers/wallet/CreateWalletPageContainer.js
@@ -23,7 +23,6 @@ export default class CreateWalletPageContainer extends Component<StoresProps> {
         <CreateWalletPage
           genWalletRecoveryPhrase={stores.substores.ada.wallets.genWalletRecoveryPhrase}
           createWallet={request => stores.substores.ada.wallets.createWallet(request)}
-          setSelectedNetwork={stores.profile.setSelectedNetwork}
           selectedNetwork={stores.profile.selectedNetwork}
           openDialog={dialog => this.props.stores.uiDialogs.open({ dialog })}
           closeDialog={this.props.stores.uiDialogs.closeActiveDialog}
diff --git a/packages/yoroi-extension/app/containers/wallet/MyWalletsPage.js b/packages/yoroi-extension/app/containers/wallet/MyWalletsPage.js
deleted file mode 100644
index 4a70f81321..0000000000
--- a/packages/yoroi-extension/app/containers/wallet/MyWalletsPage.js
+++ /dev/null
@@ -1,211 +0,0 @@
-// @flow
-import type { Node } from 'react';
-import { Component } from 'react';
-import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
-import { intlShape } from 'react-intl';
-import { observer } from 'mobx-react';
-import { ROUTES } from '../../routes-config';
-import { genLookupOrFail, getTokenName } from '../../stores/stateless/tokenHelpers';
-import { Box } from '@mui/system';
-import MyWallets from '../../components/wallet/my-wallets/MyWallets';
-import TopBarLayout from '../../components/layout/TopBarLayout';
-import WalletRow from '../../components/wallet/my-wallets/WalletRow';
-import WalletDetails from '../../components/wallet/my-wallets/WalletDetails';
-import WalletCurrency from '../../components/wallet/my-wallets/WalletCurrency';
-import WalletSubRow from '../../components/wallet/my-wallets/WalletSubRow';
-import NavPlate from '../../components/topbar/NavPlate';
-import SidebarContainer from '../SidebarContainer';
-import BannerContainer from '../banners/BannerContainer';
-import NavBarTitle from '../../components/topbar/NavBarTitle';
-import WalletSync from '../../components/wallet/my-wallets/WalletSync';
-import moment from 'moment';
-import globalMessages from '../../i18n/global-messages';
-import NavBarRevamp from '../../components/topbar/NavBarRevamp';
-import { MultiToken } from '../../api/common/lib/MultiToken';
-import type { WalletState } from '../../../chrome/extension/background/types';
-import type { StoresProps } from '../../stores';
-
-@observer
-export default class MyWalletsPage extends Component<StoresProps> {
-  static contextTypes: {| intl: $npm$ReactIntl$IntlFormat |} = {
-    intl: intlShape.isRequired,
-  };
-
-  onClose: void => void = () => {
-    this.props.stores.uiDialogs.closeActiveDialog();
-  };
-
-  openDialogWrapper: any => void = dialog => {
-    this.props.stores.uiDialogs.open({ dialog });
-  };
-
-  updateHideBalance: void => Promise<void> = async () => {
-    await this.props.stores.profile.updateHideBalance();
-  };
-
-  handleWalletNavItemClick: number => void = (
-    publicDeriverId
-  ) => {
-    this.props.stores.app.goToRoute({
-      route: ROUTES.WALLETS.ROOT,
-      publicDeriverId,
-    });
-  };
-
-  openToSettings: (number) => void = publicDeriverId => {
-    this.props.stores.wallets.setActiveWallet({
-      publicDeriverId
-    });
-    this.props.stores.app.goToRoute({
-      route: ROUTES.SETTINGS.WALLET,
-    });
-  };
-
-  render(): Node {
-    const { intl } = this.context;
-    const { stores } = this.props;
-
-    const sidebarContainer = <SidebarContainer stores={stores} />;
-    const { wallets } = stores.wallets;
-    const navbarTitle = <NavBarTitle title={intl.formatMessage(globalMessages.sidebarWallets)} />;
-
-    const navbarElementRevamp = (
-      <NavBarRevamp
-        title={navbarTitle}
-        buyButton={
-          <>
-            {/* <Button variant="secondary">{intl.formatMessage(globalMessages.send)}</Button>
-            <Button variant="secondary">{intl.formatMessage(globalMessages.receive)}</Button> */}
-          </>
-        }
-      />
-    );
-
-    const walletsList = <Box flex={1}>{wallets.map(wallet => this.generateRow(wallet))}</Box>;
-
-    return (
-      <TopBarLayout
-        banner={<BannerContainer stores={stores} />}
-        sidebar={sidebarContainer}
-        navbar={navbarElementRevamp}
-        showInContainer
-      >
-        <MyWallets>{walletsList}</MyWallets>
-      </TopBarLayout>
-    );
-  }
-
-  generateRow: (WalletState) => Node = wallet => {
-    const walletSumCurrencies = (() => {
-      const defaultToken = this.props.stores.tokenInfoStore.getDefaultTokenInfo(
-        wallet.networkId
-      );
-      const defaultTokenInfo = genLookupOrFail(this.props.stores.tokenInfoStore.tokenInfo)({
-        identifier: defaultToken.Identifier,
-        networkId: wallet.networkId,
-      });
-      return (
-        <>
-          <WalletCurrency
-            currency={getTokenName(defaultTokenInfo)}
-            tooltipText={undefined /* TODO */}
-          />
-        </>
-      );
-    })();
-
-    const rewards: MultiToken = this.props.stores.delegation.getRewardBalanceOrZero(
-      wallet
-    );
-
-    const { plate, lastSyncInfo } = wallet;
-
-    const isLoading = this.props.stores.transactions.isWalletLoading(wallet.publicDeriverId);
-
-    return (
-      <WalletRow
-        isExpandable={false /* TODO: should be expandable if > 1 public deriver */}
-        key={wallet.publicDeriverId}
-        onRowClicked={() => this.handleWalletNavItemClick(wallet.publicDeriverId)}
-        walletSumDetails={
-          <WalletDetails
-            walletAmount={wallet.balance}
-            rewards={rewards}
-            // TODO: This should be probably bound to an individual wallet
-            onUpdateHideBalance={this.updateHideBalance}
-            shouldHideBalance={this.props.stores.profile.shouldHideBalance}
-            getTokenInfo={genLookupOrFail(this.props.stores.tokenInfoStore.tokenInfo)}
-            isRefreshing={wallet.isRefreshing}
-          />
-        }
-        walletSumCurrencies={walletSumCurrencies}
-        walletSubRow={() => this.createSubrow(wallet)}
-        walletPlate={<NavPlate plate={plate} walletType={wallet.type} name={wallet.name}/>}
-        walletSync={
-          <WalletSync
-            time={lastSyncInfo.Time ? moment(lastSyncInfo.Time).fromNow() : null}
-            isRefreshing={wallet.isRefreshing}
-            isLoading={isLoading}
-          />
-        }
-        onSettings={() => this.openToSettings(wallet.publicDeriverId)}
-      />
-    );
-  };
-
-  createSubrow: (WalletState) => Node = wallet => {
-    const { intl } = this.context;
-
-    const defaultToken = this.props.stores.tokenInfoStore.getDefaultTokenInfo(
-      wallet.networkId,
-    );
-    const defaultTokenInfo = genLookupOrFail(this.props.stores.tokenInfoStore.tokenInfo)({
-      identifier: defaultToken.Identifier,
-      networkId: wallet.networkId,
-    });
-
-    // TODO: replace with wallet addresses
-    const walletAddresses = [
-      'Ae45dPwUPEZMen5UdmKCeiNqCooMVBpDQbmhM1dtFSFigvbvDTZdF4nbdf4u3',
-      'Ae2tdPwUPEZMen5UdmKCeiNqCooMVBpDQbmhM1dtFSFigvbvDTZdF4nmt4s7',
-    ];
-
-    const addressesLength = walletAddresses.length;
-
-    const plate = wallet.plate;
-
-    const walletSubRow = (
-      <WalletSubRow
-        walletInfo={{
-          conceptualWalletName: wallet.name,
-          plate,
-        }}
-        // TODO: do we delete WalletDetails? Lots of duplication with Nav alternative
-        walletDetails={
-          <WalletDetails
-            infoText={`${addressesLength} ${intl.formatMessage(
-              addressesLength > 1 ? globalMessages.addressesLabel : globalMessages.addressLabel
-            )}`}
-            // TODO: This should be probably bound to an individual wallet
-            onUpdateHideBalance={this.updateHideBalance}
-            shouldHideBalance={this.props.stores.profile.shouldHideBalance}
-            rewards={null /* TODO */}
-            walletAmount={null /* TODO */}
-            getTokenInfo={genLookupOrFail(this.props.stores.tokenInfoStore.tokenInfo)}
-            isRefreshing={false /* not actually used */}
-          />
-        }
-        walletNumber={1}
-        walletAddresses={walletAddresses /* TODO: replace with proper hashes */}
-        walletCurrencies={
-          <WalletCurrency
-            currency={getTokenName(defaultTokenInfo)}
-            tooltipText="0.060" // TODO
-          />
-        }
-      />
-    );
-
-    return walletSubRow;
-  };
-}
diff --git a/packages/yoroi-extension/app/containers/wallet/Wallet.js b/packages/yoroi-extension/app/containers/wallet/Wallet.js
index d9d1694e95..b665881901 100644
--- a/packages/yoroi-extension/app/containers/wallet/Wallet.js
+++ b/packages/yoroi-extension/app/containers/wallet/Wallet.js
@@ -5,11 +5,8 @@ import { observer } from 'mobx-react';
 import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
 import { intlShape } from 'react-intl';
 import TopBarLayout from '../../components/layout/TopBarLayout';
-import VerticallyCenteredLayout from '../../components/layout/VerticallyCenteredLayout';
 import SidebarContainer from '../SidebarContainer';
-import NavBarContainer from '../NavBarContainer';
 import BannerContainer from '../banners/BannerContainer';
-import LoadingSpinner from '../../components/widgets/LoadingSpinner';
 import { ROUTES } from '../../routes-config';
 import { allSubcategoriesRevamp } from '../../stores/stateless/topbarCategories';
 import NavBarContainerRevamp from '../NavBarContainerRevamp';
@@ -89,21 +86,11 @@ export default class Wallet extends Component<{| ...Props, ...StoresProps |}> {
     const selectedWallet = stores.wallets.selectedOrFail;
 
     if (!selectedWallet) {
-      return (
-        <TopBarLayout
-          banner={<BannerContainer stores={stores} />}
-          navbar={<NavBarContainer title="" stores={stores} />}
-          showInContainer
-        >
-          <VerticallyCenteredLayout>
-            <LoadingSpinner />
-          </VerticallyCenteredLayout>
-        </TopBarLayout>
-      );
+      return null;
     }
     const warning = this.getWarning(selectedWallet.publicDeriverId);
 
-    const isInitialSyncing = stores.wallets.isInitialSyncing(selectedWallet.publicDeriverId);
+    const isInitialSyncing = selectedWallet.lastSyncInfo.Time == null;
     const spendableBalance = stores.transactions.balance;
     const walletHasAssets = !!(spendableBalance?.nonDefaultEntries().length);
 
diff --git a/packages/yoroi-extension/app/domain/LedgerLocalizedError.js b/packages/yoroi-extension/app/domain/LedgerLocalizedError.js
index 11ddc21e86..18c9f0e1f6 100644
--- a/packages/yoroi-extension/app/domain/LedgerLocalizedError.js
+++ b/packages/yoroi-extension/app/domain/LedgerLocalizedError.js
@@ -95,6 +95,16 @@ export function convertToLocalizableError(error: Error): LocalizableError {
         ledgerErrors.cancelOnDeviceError101
       );
     }
+    if (
+      // Not running the Cardano app on Ledger
+      /General error 0x6e01/.test(error.message) ||
+        // Ledger is sleeping
+        /General error 0x5515/.test(error.message)
+    ) {
+      return new LocalizableError(
+        ledgerErrors.cardanoAppNotRunning
+      );
+    }
     if (/CIP-8 message signing not supported by Ledger app/.test(error.message)) {
       return new LocalizableError(
         ledgerErrors.deviceVersionNoDataSigningSpecific
@@ -130,11 +140,6 @@ export function convertToLocalizableError(error: Error): LocalizableError {
           ledgerErrors.cip15NotSupportedError106
         );
         break;
-      case 'DeviceStatusError: General error 0x6e01. Please consult https://github.com/cardano-foundation/ledger-app-cardano/blob/master/src/errors.h':
-        localizableError = new LocalizableError(
-          ledgerErrors.cardanoAppNotRunning
-        );
-        break;
       case 'DeviceVersionUnsupported: CIP36 registration not supported by Ledger app version 5.0.0.':
         localizableError = new LocalizableError(
           ledgerErrors.cip36NotSupported
diff --git a/packages/yoroi-extension/app/environment.js b/packages/yoroi-extension/app/environment.js
index 59e90f1964..23d171182b 100644
--- a/packages/yoroi-extension/app/environment.js
+++ b/packages/yoroi-extension/app/environment.js
@@ -128,27 +128,27 @@ export const environment = ((
     }
   }
 ): {
-    getNetworkName: void => Network,
-    getVersion: void => string,
-    MOBX_DEV_TOOLS: ?string,
-    commit: string,
-    branch: string,
-    isJest: void => boolean,
-    isDev: void => boolean,
-    isNightly: void => boolean,
-    isTest: void => boolean,
-    isMainnet: void => boolean,
-    isProduction: void => boolean,
-    getWalletRefreshInterval: void => number,
-    getServerStatusRefreshInterval: void => number,
-    isExtension: void => boolean,
-    isFirefox: void => boolean,
-    isChrome: void => boolean,
-    canRegisterProtocol: void => boolean,
-    externalPrivacyPolicyURL: void => ?string,
-    userAgentInfo: UserAgentInfo,
-    isLight: boolean,
-    ...
+  getNetworkName: void => Network,
+  getVersion: void => string,
+  MOBX_DEV_TOOLS: ?string,
+  commit: string,
+  branch: string,
+  isJest: void => boolean,
+  isDev: void => boolean,
+  isNightly: void => boolean,
+  isTest: void => boolean,
+  isMainnet: void => boolean,
+  isProduction: void => boolean,
+  getWalletRefreshInterval: void => number,
+  getServerStatusRefreshInterval: void => number,
+  userAgentInfo: UserAgentInfo,
+  isLight: boolean,
+  isExtension: void => boolean,
+  isFirefox: void => boolean,
+  isChrome: void => boolean,
+  canRegisterProtocol: void => boolean,
+  externalPrivacyPolicyURL: void => ?string,
+  ...
 });
 
 export default environment;
diff --git a/packages/yoroi-extension/app/i18n/global-messages.js b/packages/yoroi-extension/app/i18n/global-messages.js
index 9e59660816..949706d845 100644
--- a/packages/yoroi-extension/app/i18n/global-messages.js
+++ b/packages/yoroi-extension/app/i18n/global-messages.js
@@ -690,6 +690,10 @@ const globalMessages: * = defineMessages({
     id: 'sidebar.wallets',
     defaultMessage: '!!!My wallets',
   },
+  sidebarCashback: {
+    id: 'sidebar.cashback',
+    defaultMessage: '!!!Cashback',
+  },
   sidebarAssets: {
     id: 'sidebar.assets',
     defaultMessage: '!!!Assets',
@@ -1008,6 +1012,30 @@ const globalMessages: * = defineMessages({
     id: 'buysell.dialog.provider',
     defaultMessage: '!!!Provider',
   },
+  disclaimer: {
+    id: 'buysell.dialog.disclaimer',
+    defaultMessage: '!!!Disclaimer',
+  },
+  proceed: {
+    id: 'buysell.dialog.proceed',
+    defaultMessage: 'PROCEED',
+  },
+  mainnet: {
+    id: 'networkName.mainnet',
+    defaultMessage: '!!!Mainnet',
+  },
+  preprod: {
+    id: 'networkName.preprod',
+    defaultMessage: '!!!Preproduction testnet',
+  },
+  preview: {
+    id: 'networkName.preview',
+    defaultMessage: '!!!Preview testnet',
+  },
+  sancho: {
+    id: 'networkName.sancho',
+    defaultMessage: '!!!Sancho testnet',
+  },
 });
 export default globalMessages;
 
diff --git a/packages/yoroi-extension/app/i18n/locales/en-US.json b/packages/yoroi-extension/app/i18n/locales/en-US.json
index fa9c9f0169..7d5db79445 100644
--- a/packages/yoroi-extension/app/i18n/locales/en-US.json
+++ b/packages/yoroi-extension/app/i18n/locales/en-US.json
@@ -63,6 +63,35 @@
   "buysell.dialog.sellProviderFee": "2.5% fee",
   "buysell.dialog.title": "Exchange ADA",
   "buysell.end.text": "Congrats! 🎉 Your transaction is now in progress. You should be receiving the funds soon.",
+  "cashback.claim.dialog.instruction.hardware": "Confirm on your hardware wallet to claim cashback rewards.",
+  "cashback.claim.dialog.instruction.password": "Enter your password to claim cashback rewards.",
+  "cashback.claim.dialog.message.label": "Message",
+  "cashback.claim.dialog.title": "CLAIM CASHBACK",
+  "cashback.disclaimer": "By clicking \"Proceed,\" you acknowledge that you will be redirected to a third-party service provider offering cashback services in ADA currency. You may be required to agree to the terms, conditions, and privacy policies of the third-party provider to complete the transaction. Yoroi Wallet does not control, endorse, or assume responsibility for the content, security, policies, or services provided by the third party.",
+  "cashback.disclaimer.agree": "I understand this disclaimer.",
+  "cashback.disclaimer.note": "
Please note:",
+  "cashback.disclaimer.note.1": "1. Yoroi Wallet is not liable for any losses, delays, or errors that may occur while using the third-party service.",
+  "cashback.disclaimer.note.2": "2. Transactions may be subject to restrictions based on your geographic location, applicable laws, financial institution policies, or the service provider's limitations.",
+  "cashback.disclaimer.note.3": "3. Ensure you review and understand the third party's terms, as your interactions are solely governed by their agreements.",
+  "cashback.disclaimer.note.4": "4. Yoroi Wallet does not collect or store any personal or financial data submitted through the third-party platform.",
+  "cashback.not.current.warning.button.no": "no",
+  "cashback.not.current.warning.button.set.this": "set this wallet",
+  "cashback.not.current.warning.button.switch": "switch wallet",
+  "cashback.not.current.warning.button.yes": "yes",
+  "cashback.not.current.warning.current": "Current rewards wallet",
+  "cashback.not.current.warning.keep": "keep current wallet",
+  "cashback.not.current.warning.text": "Your cashback rewards are currently linked to another wallet. To claim your ADA cashback, either switch to the rewards wallet or change the rewards wallet to the one you're using now. You can always access settings at anytime to change your cashback wallet and make claiming rewards relevant for you.",
+  "cashback.not.current.warning.text.choose.1": "Your cashback rewards are currently linked to another wallet.",
+  "cashback.not.current.warning.text.choose.2": "Switch wallet to access your rewards or set this wallet as your cashback wallet.",
+  "cashback.not.current.warning.text.switch": "You will no longer be able to claim rewards linked to your previous cashback wallet until you link it again.",
+  "cashback.not.current.warning.title": "WARNING",
+  "cashback.not.current.warning.title.choose": "wrong wallet",
+  "cashback.not.current.warning.title.set.current": "Set my Current Wallet as my Cashback Wallet",
+  "cashback.not.current.warning.current": "Current rewards wallet",
+  "cashback.not.current.warning.keep": "keep current wallet",
+  "cashback.not.current.warning.text": "Your cashback rewards are currently linked to another wallet. To claim your ADA cashback, either switch to the rewards wallet or change the rewards wallet to the one you're using now. You can always access settings at anytime to change your cashback wallet and make claiming rewards relevant for you.",
+  "cashback.not.current.warning.title": "WARNING",
+  "cashback.not.current.warning.use.this": "use this wallet",
   "connector.appName": "Dapp Connector",
   "connector.appNameShort": "Connector",
   "connector.assetReceived": "{assetName} received",
@@ -70,6 +99,9 @@
   "connector.assetsReceived": "{quantity} assets received",
   "connector.assetsSent": "{quantity} assets sent",
   "connector.connect.connectedWallets": "Connected Wallets",
+  "connector.connect.cashback.addWallet": "Add wallet",
+  "connector.connect.cashback.apply.all": "The wallet you select will be applied for all partner websites.",
+  "connector.connect.cashback.trezor.disabled": "Cashback service doesn’t support Trezor wallet connection",
   "connector.connect.connectedWallets.active": "Active",
   "connector.connect.createWallet": "create wallet",
   "connector.connect.hardwareWalletsConnectWithAuthNotSupported": "Connecting to hardware wallet with authentication is not supported",
@@ -110,6 +142,7 @@
   "global.blog.learnMore": "You can read our {blogLink} to learn more.",
   "global.connector.connectedWebsites": "Connected Websites",
   "global.connector.messageReadOnly": "We are granting read-only to view utxos/addresses.",
+  "global.connector.yoroiConnector": "Yoroi Connector",
   "global.connector.yoroiDappConnector": "Yoroi Dapp Connector",
   "global.contact": "contact support",
   "global.copyTooltipMessage": "Copied",
@@ -224,6 +257,10 @@
   "myWallets.wallets.lastSyncText": "Last sync",
   "myWallets.wallets.neverSync": "Never synced",
   "networkError.label.message": "Server connection failed <br/> Please check your internet connection or reach out to our support team <a target='_blank' href='https://emurgohelpdesk.zendesk.com/hc/en-us/requests/new?ticket_form_id=360013330335'>here</a>.",
+  "networkName.mainnet": "Mainnet",
+  "networkName.preprod": "Preproduction testnet",
+  "networkName.preview": "Preview testnet",
+  "networkName.sancho": "Sancho testnet",
   "nightly.banner.label.message": "YOU ARE ON YOROI NIGHTLY.",
   "notprod.label.message": "WARNING: this is a non-production build. If something unusual occurs, double-check Yoroi's installation.",
   "profile.analytics.accept": "Accept",
@@ -289,6 +326,7 @@
   "settings.general.aboutYoroi.network.mainnet": "Mainnet Network",
   "settings.general.aboutYoroi.network.testnet": "Testnet Network",
   "settings.general.aboutYoroi.networkLabel": "Network:",
+  "settings.general.aboutYoroi.switchNetwork": "SWITCH NETWORK",
   "settings.general.aboutYoroi.telegram": "EMURGO Telegram",
   "settings.general.aboutYoroi.twitter": "Yoroi Twitter",
   "settings.general.aboutYoroi.versionLabel": "Current version:",
@@ -297,6 +335,10 @@
   "settings.general.explorer": "explorer",
   "settings.general.languageSelect.info": "For EMURGO, friendliness in Yoroi is an important topic. We believe understanding blockchain concepts is easier in your native language. We try supporting as many languages as possible, but for a broader selection of languages we need to accept the help from community translators. The selected language translation is fully provided by the community.",
   "settings.general.languageSelect.labelInfo": "The selected language translation is fully provided by the community",
+  "settings.general.switchNetwork.dialog.button.apply": "apply",
+  "settings.general.switchNetwork.dialog.label.select": "Select Network",
+  "settings.general.switchNetwork.dialog.text": "The Cardano network is a technical infrastructure combining Cardano nodes and their interactions in one unified system. It consists of a collection of nodes that communicate with each other to maintain the distributed ledger.",
+  "settings.general.switchNetwork.dialog.title": "Switch network",
   "settings.general.translation.acknowledgment": "Thank you to the following for their contribution: ",
   "settings.general.translation.contributors": "_",
   "settings.general.theme.light": "Light Theme",
@@ -348,12 +390,16 @@
   "settings.unitOfAccount.note": "<strong>Note:</strong> coin price is approximate and may not match the price of any given trading platform. Any transactions based on these price approximates are done at your own risk.",
   "settings.unitOfAccount.revamp.label": "Select currency",
   "settings.unitOfAccount.title": "Fiat pairing",
+  "settings.cashback.title": "Cashback rewards wallet",
+  "settings.cashback.note": "Your connected wallet is the designated wallet for receiving ADA cashback rewards and applied to all partner websites. You can switch to a different wallet anytime to ensure your cashback is directed to your preferred wallet or select “None” to decline this service.",
+  "settings.cashback.label": "Connected wallet",
   "sidebar.assets": "Assets",
   "sidebar.portfolio": "Portfolio",
   "sidebar.faq": "Faq",
   "sidebar.feedback": "Feedback",
   "sidebar.newUpdates": "New updates",
   "sidebar.nfts": "NFTs",
+  "sidebar.cashback": "Cashback",
   "sidebar.settings": "Settings",
   "sidebar.governance": "Governance",
   "sidebar.staking": "Staking",
@@ -913,7 +959,10 @@
   "wallet.settings.changePassword.dialog.repeatPasswordLabel": "Repeat new password",
   "wallet.settings.changePassword.dialog.title.changePassword": "Change password",
   "wallet.settings.delete.accept": "I still have the means to restore this wallet",
+  "wallet.settings.delete.accept.cashback": "I still have the means to restore this wallet and want to stop generating cashback rewards for this wallet.",
+  "wallet.settings.delete.warning1.cashback": "Removing this wallet will not impact its balance, but as it the rewards wallet, this may disrupt your cashback process. You can also use another wallet for connecting the cashback before removing this wallet.",
   "wallet.settings.delete.warning2": "Please double-check you still have the means to restore access to this wallet. If you cannot, removing the wallet may result in irreversible loss of funds.",
+  "wallet.settings.delete.warning2.cashback": "This wallet can be restored again at any time, but double-check if you still have the means to restore access to it. If you cannot, removing the wallet may result in irreversible loss of funds.",
   "wallet.settings.export.explanation": "This can be used to transfer a wallet between devices.",
   "wallet.settings.export.label": "Export wallet",
   "wallet.settings.general.language": "Language",
diff --git a/packages/yoroi-extension/app/routes-config.js b/packages/yoroi-extension/app/routes-config.js
index e7b226fd2e..50106e5a05 100644
--- a/packages/yoroi-extension/app/routes-config.js
+++ b/packages/yoroi-extension/app/routes-config.js
@@ -6,7 +6,6 @@ export const ROUTES = {
   ROOT: '/',
   PAGE_ERROR: PAGE_ERROR_SUBROUTE,
   NIGHTLY_INFO: '/nightly',
-  MY_WALLETS: '/my-wallets',
   PROFILE: {
     LANGUAGE_SELECTION: '/profile/language-selection',
     TERMS_OF_USE: '/profile/terms-of-use',
@@ -50,16 +49,16 @@ export const ROUTES = {
   SEND_FROM_URI: {
     ROOT: '/send-from-uri',
   },
-  OAUTH_FROM_EXTERNAL: {
-    DROPBOX: '/foo', // TODO: think about this. GET params don't work well with react-router I think
-    // DROPBOX: '/access_token=:token&token_type=:token_type&uid=:uid&account_id=:account_id',
-  },
   // revamp
   STAKING: '/staking',
   ASSETS: {
     ROOT: '/assets',
     DETAILS: '/assets/tokens/:tokenId',
   },
+  // Bringweb3
+  CASHBACK: {
+    ROOT: '/cashback'
+  },
   NFTS: {
     ROOT: '/nfts',
     DETAILS: '/nfts/:nftId',
diff --git a/packages/yoroi-extension/app/stores/base/BaseLoadingStore.js b/packages/yoroi-extension/app/stores/base/BaseLoadingStore.js
index baea1048bf..f0c49a7cbf 100644
--- a/packages/yoroi-extension/app/stores/base/BaseLoadingStore.js
+++ b/packages/yoroi-extension/app/stores/base/BaseLoadingStore.js
@@ -34,34 +34,32 @@ export default class BaseLoadingStore<TStores> extends Store<TStores> {
         + stringifyError(e)
       );
     }
-    await Promise
-      .all(this.__blockingLoadingRequests.map(([r]) => r.execute()))
-      .then(async () => {
-        Logger.debug(`[yoroi] closing other instances`);
-        await closeOtherInstances(this.getTabIdKey.bind(this)());
-        Logger.debug(`[yoroi][preLoadingScreenEnd]`);
-        await this.preLoadingScreenEnd.bind(this)();
-        runInAction(() => {
-          this.error = null;
-          this._loading = false;
-          this.postLoadingScreenEnd();
-          Logger.debug(`[yoroi] loading ended`);
-        });
-        return undefined;
-      })
-      .catch((error) => {
-        const failedBlockingLoadingRequestName =
-          this.__blockingLoadingRequests.find(([r]) => r.error != null)?.[1];
-        const errorType = failedBlockingLoadingRequestName || 'unclear';
-        Logger.error(
-          `${nameof(BaseLoadingStore)}::${nameof(this.load)}
+    try {
+      await Promise.all(this.__blockingLoadingRequests.map(([r]) => r.execute()))
+
+      Logger.debug(`[yoroi] closing other instances`);
+      await closeOtherInstances(this.getTabIdKey.bind(this)());
+
+      await this.loadingEnd();
+
+      runInAction(() => {
+        this.error = null;
+        this._loading = false;
+        Logger.debug(`[yoroi] loading ended`);
+      });
+    } catch (error) {
+      const failedBlockingLoadingRequestName =
+        this.__blockingLoadingRequests.find(([r]) => r.error != null)?.[1];
+      const errorType = failedBlockingLoadingRequestName || 'unclear';
+      Logger.error(
+        `${nameof(BaseLoadingStore)}::${nameof(this.load)}
            Unable to load libraries (error type: ${errorType}) `
           + stringifyError(error)
-        );
-        runInAction(() => {
-          this.error = new UnableToLoadError();
-        });
+      );
+      runInAction(() => {
+        this.error = new UnableToLoadError();
       });
+    }
   }
 
   @computed get isLoading(): boolean {
@@ -72,10 +70,7 @@ export default class BaseLoadingStore<TStores> extends Store<TStores> {
     throw new Error(`${nameof(BaseLoadingStore)}::${nameof(this.getTabIdKey)} child needs to override this function`);
   }
 
-  async preLoadingScreenEnd(): Promise<void> {
-    // eslint-disable-line no-empty-function
-  }
-  postLoadingScreenEnd(): void {
-    // eslint-disable-line no-empty-function
+  async loadingEnd(): Promise<void> {
+    throw new Error('should be overridden by subclass');
   }
 }
diff --git a/packages/yoroi-extension/app/stores/base/BaseProfileStore.js b/packages/yoroi-extension/app/stores/base/BaseProfileStore.js
index d5f8dea8ed..6e8b36a8a8 100644
--- a/packages/yoroi-extension/app/stores/base/BaseProfileStore.js
+++ b/packages/yoroi-extension/app/stores/base/BaseProfileStore.js
@@ -18,6 +18,8 @@ import { noop } from '../../coreUtils';
 import type { Theme } from '../../styles/themes';
 import { THEMES } from '../../styles/themes';
 import { refreshCurrentCoinPrice } from '../../api/thunk';
+import type { NetworkRow } from '../../api/ada/lib/storage/database/primitives/tables';
+import { getNetworkById, networks } from '../../api/ada/lib/storage/database/prepackaged/networks';
 
 interface LoadingStore {
   +registerBlockingLoadingRequest: (promise: Promise<void>, name: string) => void
@@ -144,8 +146,18 @@ export default class BaseProfileStore
     (void) => Promise<?boolean>
   > = new Request(this.api.localStorage.loadIsAnalyticsAllowed);
 
+  @observable setBringSandboxRequest: Request<
+    (boolean) => Promise<void>
+    > = new Request(this.api.localStorage.setBringSandbox);
+
+  @observable getBringSandboxRequest: Request<
+    (void) => Promise<boolean>
+    > = new Request(this.api.localStorage.getBringSandbox);
+
   @observable _acceptedTosVersion: {| version: ?number |} = { version: undefined };
 
+  currentNetworkId: ?number = undefined;
+
   setup(): void {
     super.setup();
     this.registerReactions([
@@ -154,6 +166,7 @@ export default class BaseProfileStore
     ]);
     this._getSelectComplexityLevel(); // eagerly cache
     noop(this.isRevampAnnounced);
+    this.getBringSandboxRequest.execute();
     this.stores.loading.registerBlockingLoadingRequest(
       this._loadAcceptedTosVersion(),
       'load-tos-version',
@@ -162,6 +175,31 @@ export default class BaseProfileStore
       this._loadWhetherAnalyticsAllowed(),
       'load-analytics-flag',
     );
+    this.stores.loading.registerBlockingLoadingRequest(
+      this._loadCurrentNetworkId(),
+      'load-current-network-id',
+    );
+  }
+
+  getCurrentNetworkId(): number {
+    const { currentNetworkId } = this;
+    if (currentNetworkId == null) {
+      return networks.CardanoMainnet.NetworkId;
+    }
+    return currentNetworkId;
+  }
+
+  async setCurrentNetworkId(id: number): Promise<void> {
+    this.currentNetworkId = id;
+    await this.api.localStorage.saveCurrentNetworkId(id);
+  }
+
+  _loadCurrentNetworkId: () => Promise<void> = async () => {
+    this.currentNetworkId = await this.api.localStorage.loadCurrentNetworkId();
+  }
+
+  get selectedNetwork(): $ReadOnly<NetworkRow> {
+    return getNetworkById(this.getCurrentNetworkId());
   }
 
   _loadWhetherAnalyticsAllowed: () => Promise<void> = async () => {
diff --git a/packages/yoroi-extension/app/stores/stateless/sidebarCategories.js b/packages/yoroi-extension/app/stores/stateless/sidebarCategories.js
index f926849362..aad91d2589 100644
--- a/packages/yoroi-extension/app/stores/stateless/sidebarCategories.js
+++ b/packages/yoroi-extension/app/stores/stateless/sidebarCategories.js
@@ -1,6 +1,7 @@
 // @flow
 import type { MessageDescriptor } from 'react-intl';
 import { ReactComponent as dappConnectorIcon } from '../../assets/images/dapp-connector/dapp-connector.inline.svg';
+import { ReactComponent as CashbackIcon } from '../../assets/images/sidebar/cashback.inline.svg';
 import { ReactComponent as governanceIcon } from '../../assets/images/sidebar/revamp/governance.inline.svg';
 import { ReactComponent as nftsIcon } from '../../assets/images/sidebar/revamp/nfts.inline.svg';
 import { ReactComponent as portfolioIcon } from '../../assets/images/sidebar/revamp/portfolio.inline.svg';
@@ -16,9 +17,9 @@ import type { WalletState } from '../../../chrome/extension/background/types';
 
 type isVisibleFunc = ({|
   hasAnyWallets: boolean,
-  selected: ?WalletState,
-  currentRoute: string,
-  isRewardWallet: isRewardWalletFunc,
+    selected: ?WalletState,
+      currentRoute: string,
+        isRewardWallet: isRewardWalletFunc,
 |}) => boolean;
 
 type isRewardWalletFunc = ({ publicDeriverId: number, ... }) => boolean;
@@ -26,10 +27,10 @@ type isRewardWalletFunc = ({ publicDeriverId: number, ... }) => boolean;
 export type SidebarCategoryRevamp = {|
   +className: string,
   +route: string,
-  +icon: string,
-  +label?: MessageDescriptor,
-  +isVisible: isVisibleFunc,
-  +featureFlagName?: string,
+    +icon: string,
+      +label ?: MessageDescriptor,
+      +isVisible: isVisibleFunc,
+        +featureFlagName ?: string,
 |};
 
 // TODO: Fix routes and isVisible prop
@@ -82,6 +83,13 @@ export const allCategoriesRevamp: Array<SidebarCategoryRevamp> = [
     // $FlowFixMe[prop-missing]
     isVisible: request => request.selected != null,
   },
+  {
+    className: 'cashback',
+    route: ROUTES.CASHBACK.ROOT,
+    icon: CashbackIcon,
+    label: globalMessages.sidebarCashback,
+    isVisible: ({ selected }) => selected?.type !== 'trezor',
+  },
   {
     className: 'connected-websites',
     route: ROUTES.DAPP_CONNECTOR.CONNECTED_WEBSITES,
diff --git a/packages/yoroi-extension/app/stores/toplevel/AppStore.js b/packages/yoroi-extension/app/stores/toplevel/AppStore.js
index 7cf884a083..e9282c981d 100644
--- a/packages/yoroi-extension/app/stores/toplevel/AppStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/AppStore.js
@@ -2,7 +2,6 @@
 import { computed } from 'mobx';
 import Store from '../base/Store';
 import { buildRoute } from '../../utils/routing';
-import { ROUTES } from '../../routes-config';
 import type { StoresMap } from '../index';
 
 export default class AppStore extends Store<StoresMap> {
@@ -24,31 +23,13 @@ export default class AppStore extends Store<StoresMap> {
   goToRoute: {|
     route: string,
     params?: Object,
-    publicDeriverId?: null | number,
   |} => void = (
     options
   ) => {
     const routePath = buildRoute(options.route, options.params);
-    const { stores } = this;
-    const currentRoute = stores.router.location.pathname;
-    if (
-      options.publicDeriverId !== undefined &&
-      options.publicDeriverId !== stores.wallets.selected?.publicDeriverId
-    ) {
-      if (options.publicDeriverId == null) {
-        stores.wallets.unsetActiveWallet();
-      } else {
-        stores.wallets.setActiveWallet({ publicDeriverId: options.publicDeriverId });
-      }
-      // we can't clear the browser history programmatically (requires root privilege)
-      // so instead, we route the user to a page that blocks the back button
-      stores.router.push({ pathname: ROUTES.SWITCH });
-      // we need the timeout otherwise mobx will optimize out the fake path
-      setTimeout(() => {
-        stores.router.push({ pathname: routePath });
-      });
-    } else if (currentRoute !== routePath) {
-      stores.router.push(routePath);
+    const currentRoute = this.stores.router.location.pathname;
+    if (currentRoute !== routePath) {
+      this.stores.router.push(routePath);
     }
   };
 }
diff --git a/packages/yoroi-extension/app/stores/toplevel/LoadingStore.js b/packages/yoroi-extension/app/stores/toplevel/LoadingStore.js
index 8faab29781..4fafe09abf 100644
--- a/packages/yoroi-extension/app/stores/toplevel/LoadingStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/LoadingStore.js
@@ -1,7 +1,6 @@
 // @flow
 import BigNumber from 'bignumber.js';
 import { action, observable, computed, runInAction } from 'mobx';
-import { pathToRegexp } from 'path-to-regexp';
 import BaseLoadingStore from '../base/BaseLoadingStore';
 import { ROUTES } from '../../routes-config';
 import { matchRoute } from '../../utils/routing';
@@ -26,8 +25,6 @@ export default class LoadingStore extends BaseLoadingStore<StoresMap> {
    * null if app not opened from URI Scheme OR URI scheme was invalid
    */
   @observable _uriParams: ?UriParams = null;
-  @observable _shouldRedirect: boolean = false;
-  @observable _redirectUri: string = '';
   sellAdaParams: ?SellAdaParamsType = null;
 
   _originRoute: {|
@@ -53,10 +50,22 @@ export default class LoadingStore extends BaseLoadingStore<StoresMap> {
     }
   }
 
+  get landingRoute(): string | null {
+    const route = this._originRoute.route.replace(/\/$/, '');
+    if (route === '') {
+      return null;
+    }
+    return route;
+  }
+
   @computed get fromUriScheme(): boolean {
     return matchRoute(ROUTES.SEND_FROM_URI.ROOT, this._originRoute.route);
   }
 
+  get shouldGotoCashback(): boolean {
+    return matchRoute(ROUTES.CASHBACK.ROOT, this._originRoute.route);
+  }
+
   @computed get uriParams(): ?UriParams {
     return this._uriParams;
   }
@@ -67,16 +76,15 @@ export default class LoadingStore extends BaseLoadingStore<StoresMap> {
     });
   }
 
-  @computed get shouldRedirect(): boolean {
-    return this._shouldRedirect;
-  }
-
-  @computed get redirectUri() : string {
-    return this._redirectUri;
-  }
-
-  async preLoadingScreenEnd(): Promise<void> {
-    await super.preLoadingScreenEnd();
+  async loadingEnd(): Promise<void> {
+    // Save the landing route and go to the route that shows the loading screen
+    runInAction(() => {
+      this._originRoute = {
+        route: this.stores.app.currentRoute,
+        location: window.location.href,
+      };
+    });
+    this.stores.app.goToRoute({ route: ROUTES.ROOT });
 
     if (this.fromUriScheme) {
       const networkId = networks.CardanoMainnet.NetworkId;
@@ -109,34 +117,6 @@ export default class LoadingStore extends BaseLoadingStore<StoresMap> {
     this._originRoute = { route: '', location: '' };
   }
 
-  @action
-  redirect: void => void = () => {
-    this._shouldRedirect = false;
-    this.stores.app.goToRoute({
-      route: this._redirectUri
-    });
-  }
-
-  _redirectRegex: RegExp = pathToRegexp(ROUTES.OAUTH_FROM_EXTERNAL.DROPBOX);
-
-  postLoadingScreenEnd(): void {
-    super.postLoadingScreenEnd();
-    const { stores } = this;
-    if (this._redirectRegex.test(stores.app.currentRoute)) {
-      this._shouldRedirect = true;
-      this._redirectUri = stores.app.currentRoute;
-    }
-    // before redirecting, save origin route in case we need to come back to
-    // it later (this is the case when user comes from a URI link)
-    runInAction(() => {
-      this._originRoute = {
-        route: stores.app.currentRoute,
-        location: window.location.href,
-      };
-    });
-    stores.app.goToRoute({ route: ROUTES.ROOT });
-  }
-
   getTabIdKey(): string {
     return TabIdKeys.Primary;
   }
diff --git a/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js b/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js
index e8b100f371..e5804418f7 100644
--- a/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js
@@ -1,11 +1,10 @@
 // @flow
-import { action, computed, observable, runInAction } from 'mobx';
+import { computed, observable, runInAction } from 'mobx';
 import BigNumber from 'bignumber.js';
 import BaseProfileStore from '../base/BaseProfileStore';
 import Request from '../lib/LocalizedRequest';
 import environment from '../../environment';
 import { ROUTES } from '../../routes-config';
-import type { NetworkRow } from '../../api/ada/lib/storage/database/primitives/tables';
 import type { StoresMap } from '../index';
 import { ComplexityLevels } from '../../types/complexityLevelType';
 import type { WalletsNavigation } from '../../api/localStorage'
@@ -14,8 +13,6 @@ import { subscribe } from '../../api/thunk';
 import { noop } from '../../coreUtils';
 
 export default class ProfileStore extends BaseProfileStore<StoresMap> {
-  @observable __selectedNetwork: void | $ReadOnly<NetworkRow> = undefined;
-
   /**
    * We only want to redirect users once when the app launches
    */
@@ -104,25 +101,29 @@ export default class ProfileStore extends BaseProfileStore<StoresMap> {
         await stores.memos.loadFromStorage();
         await stores.tokenInfoStore.refreshTokenInfo();
         await stores.coinPriceStore.loadFromStorage();
-
         await wallets.restoreWalletsFromStorage();
-        if (wallets.hasAnyWallets && stores.loading.fromUriScheme) {
-          stores.app.goToRoute({ route: ROUTES.SEND_FROM_URI.ROOT });
-        } else {
-          const firstWallet =
-            wallets.wallets.length !== 0 ? wallets.wallets[0] : null;
-          if (firstWallet == null) {
-            stores.app.goToRoute({ route: ROUTES.WALLETS.ADD });
-            return;
-          }
-          const lastSelectedWallet = await this.stores.wallets.getLastSelectedWallet();
-          stores.app.goToRoute({
-            route: ROUTES.WALLETS.ROOT,
-            publicDeriverId: lastSelectedWallet?.publicDeriverId ?? firstWallet.publicDeriverId,
-          });
+
+        const firstWallet = wallets.wallets.length !== 0 ? wallets.wallets[0] : null;
+        if (firstWallet == null) {
+          stores.app.goToRoute({ route: ROUTES.WALLETS.ADD });
+          return;
+        }
+        let wallet;
+        if (stores.loading.shouldGotoCashback) {
+          wallet = await wallets.getCashbackWallet();
         }
-        if (stores.loading.shouldRedirect) {
-          stores.loading.redirect();
+        if (!wallet) {
+          wallet = await wallets.getLastSelectedWallet();
+        }
+        if (!wallet) {
+          wallet = firstWallet;
+        }
+        stores.wallets.setActiveWallet({ publicDeriverId: wallet.publicDeriverId });
+
+        if (stores.loading.landingRoute) {
+          stores.app.goToRoute({ route: stores.loading.landingRoute });
+        } else {
+          stores.app.goToRoute({ route: ROUTES.WALLETS.ROOT });
         }
         runInAction(() => {
           this.hasRedirected = true;
@@ -164,7 +165,6 @@ export default class ProfileStore extends BaseProfileStore<StoresMap> {
       this._checkSetupSteps,
     ]);
     this._getUriSchemeAcceptance(); // eagerly cache
-    noop(this._getSortedWalletList());
   }
 
   teardown(): void {
@@ -178,16 +178,6 @@ export default class ProfileStore extends BaseProfileStore<StoresMap> {
     });
   };
 
-  // ========== Active API ========== //
-
-  @computed get selectedNetwork(): void | $ReadOnly<NetworkRow> {
-    return this.__selectedNetwork;
-  }
-
-  @action setSelectedNetwork: ($ReadOnly<NetworkRow> | void) => void = type => {
-    this.__selectedNetwork = type;
-  };
-
   // ========== Paper Wallets ========== //
 
   @computed get paperWalletsIntro(): string {
@@ -246,24 +236,6 @@ export default class ProfileStore extends BaseProfileStore<StoresMap> {
       }
     }
   };
-
-  // ========== Sort wallets - Revamp ========== //
-  @computed get walletsNavigation(): WalletsNavigation {
-    let { result } = this.getWalletsNavigationRequest;
-    if (result == null) {
-      result = this.getWalletsNavigationRequest.execute().result;
-    }
-    return result ?? { cardano: [] };
-  }
-  _getSortedWalletList: void => Promise<void> = async () => {
-    await this.getWalletsNavigationRequest.execute();
-  };
-
-  updateSortedWalletList: WalletsNavigation => Promise<void>
-    = async (walletsNavigation) => {
-    await this.setWalletsNavigationRequest.execute(walletsNavigation);
-    await this.getWalletsNavigationRequest.execute();
-  };
 }
 
 function getPaperWalletIntro(currentLocale: string, defaultLocale: string): string {
diff --git a/packages/yoroi-extension/app/stores/toplevel/WalletSettingsStore.js b/packages/yoroi-extension/app/stores/toplevel/WalletSettingsStore.js
index 4f4d6a5050..cc3d9e7623 100644
--- a/packages/yoroi-extension/app/stores/toplevel/WalletSettingsStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/WalletSettingsStore.js
@@ -110,16 +110,6 @@ export default class WalletSettingsStore extends Store<StoresMap> {
     const { stores } = this;
     stores.wallets.unsetActiveWallet(); // deselect before deleting
 
-    // Remove this wallet from wallet sort list
-    const walletsNavigation = stores.profile.walletsNavigation
-    const newWalletsNavigation = {
-      ...walletsNavigation,
-      // $FlowFixMe[invalid-computed-prop]
-      'cardano': walletsNavigation.cardano.filter(
-        walletId => walletId !== request.publicDeriverId)
-    }
-    await stores.profile.updateSortedWalletList(newWalletsNavigation);
-
     // ==================== Disconnect related dApps ====================
     await this.stores.connector.getConnectorWhitelist();
     const connectorWhitelist = stores.connector.currentConnectorWhitelist;
diff --git a/packages/yoroi-extension/app/stores/toplevel/WalletStore.js b/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
index 98bfdc3c97..9258949217 100644
--- a/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
@@ -15,7 +15,7 @@ import { createProblematicWalletDialog } from '../../containers/wallet/dialogs/P
 import type { StoresMap } from '../index';
 import { getNetworkById, getCardanoHaskellBaseConfig } from '../../api/ada/lib/storage/database/prepackaged/networks';
 import type { WalletState } from '../../../chrome/extension/background/types';
-import { getWallets, subscribe, listenForWalletStateUpdate } from '../../api/thunk';
+import { getWallets, subscribe, listenForWalletStateUpdate, setCashbackWallet } from '../../api/thunk';
 import { FlagsApi } from '@emurgo/yoroi-lib/dist/flags';
 import type { StorageAPI } from '@emurgo/yoroi-lib/dist/flags';
 import { createFlagStorage, loadSubmittedTransactions } from '../../api/localStorage';
@@ -38,7 +38,6 @@ export type SendMoneyRequest = Request<DeferredCall<{| txId: string |}>>;
 export default class WalletStore extends Store<StoresMap> {
   ON_VISIBLE_DEBOUNCE_WAIT: number = 1000;
 
-  @observable initialSyncingWalletIds: Set<number> = observable.set();
   @observable wallets: Array<WalletState> = [];
   @observable selectedIndex: null | number = null;
   // mobx is not smart enough to update the wallet name on the nav bar without this
@@ -76,6 +75,10 @@ export default class WalletStore extends Store<StoresMap> {
   flagStorage: StorageAPI;
   absoluteSlotGetters: { [string]: () => Promise<number> } = {};
 
+  @observable getCashbackWalletRequest: Request<
+    () => Promise<?WalletState>
+  > = new Request(this.getCashbackWallet.bind(this));
+
   setup(): void {
     super.setup();
     this.flagStorage = createFlagStorage();
@@ -99,12 +102,7 @@ export default class WalletStore extends Store<StoresMap> {
           runInAction(() => {
             Object.assign(this.wallets[index], newWalletState);
           });
-          if (this.initialSyncingWalletIds.has(params.publicDeriverId)) {
-            this.stores.addresses.refreshAddressesFromDb(this.wallets[index]);
-          }
-          runInAction(() => {
-            this.initialSyncingWalletIds.delete(params.publicDeriverId);
-          });
+          this.stores.addresses.refreshAddressesFromDb(this.wallets[index]);
           await this.stores.transactions.updateNewTransactions(params.newTxs, this.wallets[index]);
         }
       } else if (params.eventType === 'remove') {
@@ -181,7 +179,6 @@ export default class WalletStore extends Store<StoresMap> {
         publicDeriverId: newWallet.publicDeriverId,
       });
       this.stores.uiDialogs.closeActiveDialog();
-      this.initialSyncingWalletIds.add(newWallet.publicDeriverId);
       this.stores.app.goToRoute({ route: ROUTES.WALLETS.ROOT });
     });
   };
@@ -220,13 +217,14 @@ export default class WalletStore extends Store<StoresMap> {
 
     runInAction(() => {
       this.wallets.push(wallet);
-      this.initialSyncingWalletIds.add(wallet.publicDeriverId);
     });
   };
 
   /** Make all API calls required to setup/update wallet */
   @action restoreWalletsFromStorage: void => Promise<void> = async () => {
-    const result = await this.getInitialWallets.execute().promise;
+    const result = await this.getInitialWallets.execute(
+      this.stores.profile.getCurrentNetworkId()
+    ).promise;
     if (result == null || result.length === 0) return;
 
     for (const publicDeriver of result) {
@@ -238,6 +236,15 @@ export default class WalletStore extends Store<StoresMap> {
       this.stores.addresses.refreshAddressesFromDb(publicDeriver);
     }
 
+    const orderMap: Map<string, number> = new Map();
+    (await this.api.localStorage.loadWalletListOrder()).forEach((publicKey, index) => {
+      orderMap.set(publicKey, index)
+    });
+    result.sort((w1, w2) => (
+      (orderMap.get(w1.publicKey) ?? Number.MAX_VALUE) -
+        (orderMap.get(w2.publicKey) ?? Number.MAX_VALUE)
+    ));
+
     runInAction(() => {
       this.wallets.push(...result);
     });
@@ -278,24 +285,22 @@ export default class WalletStore extends Store<StoresMap> {
     if (walletIndex === -1) {
       throw new Error('unexpected missing wallet id');
     }
-    this.stores.profile.setSelectedNetwork(
-      getNetworkById(this.wallets[walletIndex].networkId)
-    );
     this.selectedIndex = walletIndex;
     this.selectedWalletName = this.wallets[walletIndex].name;
-    this.api.localStorage.setSelectedWalletId(publicDeriverId);
+    noop(this.api.localStorage.setSelectedWalletPublicKey(
+      this.wallets[walletIndex].publicKey
+    ));
     noop(subscribe(publicDeriverId));
     // Catalyst update // todo: maybe check if network changed
     noop(this.stores.substores.ada.votingStore.updateCatalystRoundInfo());
   };
 
   getLastSelectedWallet: void => Promise<?WalletState> = async () => {
-    const walletId: ?number = await this.api.localStorage.getSelectedWalletId();
-    return this.wallets.find(wallet => wallet.publicDeriverId === walletId);
+    const lastSelectedPublicKey: ?string = await this.api.localStorage.getSelectedWalletPublicKey();
+    return this.wallets.find(wallet => wallet.publicKey === lastSelectedPublicKey);
   };
 
   @action unsetActiveWallet: void => void = () => {
-    this.stores.profile.setSelectedNetwork(undefined);
     this.selectedIndex = null;
     this.selectedWalletName = null;
   };
@@ -407,10 +412,6 @@ export default class WalletStore extends Store<StoresMap> {
     return resp;
   };
 
-  isInitialSyncing: (number) => boolean = (publicDeriverId) => {
-    return this.initialSyncingWalletIds.has(publicDeriverId);
-  }
-
   @action onRenameSelectedWallet: (string) => void = (newName) => {
     this.selectedWalletName = newName;
     if (this.selectedIndex != null) {
@@ -428,6 +429,34 @@ export default class WalletStore extends Store<StoresMap> {
       submittedTxs,
     );
   }
+
+  async getCashbackWallet(): Promise<?WalletState> {
+    const savedCashbackWalletId = await this.api.localStorage.getCashbackWalletId();
+    if (typeof savedCashbackWalletId !== 'number') {
+      return null;
+    }
+    for (const wallet of this.wallets) {
+      if (wallet.publicDeriverId === savedCashbackWalletId) {
+        return wallet;
+      }
+    }
+    return null;
+  }
+
+  setCashbackWallet(id: number): void {
+    setCashbackWallet(id);
+    this.getCashbackWalletRequest.patch(() => this.wallets.find(w => w.publicDeriverId === id));
+  }
+
+  async reorderWallets(from: number, to: number): Promise<void> {
+    const selectedWallet = this.selected;
+    runInAction(() => {
+      const [moved] = this.wallets.splice(from, 1);
+      this.wallets.splice(to, 0, moved);
+      this.selectedIndex = this.wallets.indexOf(selectedWallet);
+    });
+    await this.api.localStorage.saveWalletListOrder(this.wallets.map(wallet => wallet.publicKey));
+  }
 }
 
 export const WalletCreationNotifications: {| [key: string]: Notification |} = {
diff --git a/packages/yoroi-extension/app/utils/URIHandling.js b/packages/yoroi-extension/app/utils/URIHandling.js
index 41e0b59606..8687225cb9 100644
--- a/packages/yoroi-extension/app/utils/URIHandling.js
+++ b/packages/yoroi-extension/app/utils/URIHandling.js
@@ -47,7 +47,7 @@ const extractAddress: (
   currencyValidator,
 ) => {
   // consider use of URLSearchParams
-  const addressRegex = new RegExp('cardano:([A-Za-z0-9]+)');
+  const addressRegex = new RegExp('cardano:([A-Za-z0-9_]+)');
   const currencyRegex = new RegExp('(cardano+):');
   const addressMatch = addressRegex.exec(uri);
   const currencyMatch = currencyRegex.exec(uri);
diff --git a/packages/yoroi-extension/chrome/constants-mv2.js b/packages/yoroi-extension/chrome/constants-mv2.js
index f81572f587..b7e03c17e1 100644
--- a/packages/yoroi-extension/chrome/constants-mv2.js
+++ b/packages/yoroi-extension/chrome/constants-mv2.js
@@ -10,12 +10,12 @@ export function genCSP(request: {|
   isDev: boolean,
   additional: {|
     'default-src'?: Array<string>,
-    'frame-src'?: Array<string>,
-    'script-src'?: Array<string>,
-    'object-src'?: Array<string>,
-    'connect-src'?: Array<string>,
-    'style-src'?: Array<string>,
-    'img-src'?: Array<string>,
+      'frame-src' ?: Array < string >,
+      'script-src' ?: Array < string >,
+      'object-src' ?: Array < string >,
+      'connect-src' ?: Array < string >,
+      'style-src' ?: Array < string >,
+      'img-src' ?: Array < string >,
   |},
 |}): string {
   const defaultSrc = request.additional['default-src'] ?? [];
@@ -49,6 +49,11 @@ export function genCSP(request: {|
   frameSrc.push('https://emurgo.github.io/yoroi-extension-ledger-bridge');
   frameSrc.push('https://emurgo.github.io/');
 
+  // Bringweb3
+  frameSrc.push('http://localhost:5173/')
+  frameSrc.push('https://*.bringweb3.io/')
+  connectSrc.push('https://*.bringweb3.io')
+
   // Analytics
   connectSrc.push('https://analytics.emurgo-rnd.com/');
   connectSrc.push('https://api2.amplitude.com/');
@@ -67,6 +72,11 @@ export function genCSP(request: {|
   connectSrc.push('https://aggregator.muesliswap.com/');
   connectSrc.push('https://onchain2.muesliswap.com/');
 
+  // Bringweb3
+  frameSrc.push('http://localhost:5173/')
+  frameSrc.push('https://*.bringweb3.io/')
+  connectSrc.push('https://*.bringweb3.io')
+
   // wasm-eval is needed to compile WebAssembly in the browser
   // note: wasm-eval is not standardized but empirically works in Firefox & Chrome https://github.com/w3c/webappsec-csp/pull/293
   const evalSrc = "'wasm-eval'";
diff --git a/packages/yoroi-extension/chrome/constants.js b/packages/yoroi-extension/chrome/constants.js
index 6394b5a431..44bf773d5f 100644
--- a/packages/yoroi-extension/chrome/constants.js
+++ b/packages/yoroi-extension/chrome/constants.js
@@ -46,6 +46,10 @@ export function genCSP(request: {|
   connectSrc.push('https://aggregator.muesliswap.com/');
   connectSrc.push('https://onchain2.muesliswap.com/');
 
+  // Bringweb3
+  frameSrc.push('https://*.bringweb3.io/')
+  connectSrc.push('https://*.bringweb3.io')
+
   // unsafe-inline is unfortunately required by style-loader (even in production builds)
   const evalStyle = "'unsafe-inline'";
   return [
diff --git a/packages/yoroi-extension/chrome/content-scripts/bringInject.js b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
new file mode 100644
index 0000000000..bd19657415
--- /dev/null
+++ b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
@@ -0,0 +1,223 @@
+// @flow
+import { bringInitContentScript } from "@bringweb3/chrome-extension-kit";
+import {
+  getFirstAddress,
+  getTheme,
+  promptCreationOrSelection,
+  listenForCashbackWalletChange,
+} from './bringLib';
+
+const darkTheme = Object.freeze({
+  // font
+  fontUrl: 'https://fonts.googleapis.com/css2?family=Rubik:ital,wght@0,300..900;1,300..900&display=swap',
+  fontFamily: '"Rubik", sans-serif',
+  // Popup
+  popupBg: "#15171F",
+  popupShadow: "0px 6px 20px 0px rgba(0, 0, 0, 0.10), 0px 1px 8px 0px rgba(0, 0, 0, 0.06)",
+  xBtnFC: "#E1E6F5",
+  // Primary button
+  primaryBtnBg: "#4B6DDE",
+  primaryBtnFS: "16px",
+  primaryBtnFW: "500",
+  primaryBtnFC: "#FFFFFF",
+  primaryBtnBorderC: "transparent",
+  primaryBtnBorderW: "0",
+  primaryBtnRadius: "8px",
+  // Secondary button
+  secondaryBtnBg: "#15171F",
+  secondaryBtnFS: "14px",
+  secondaryBtnFW: "500",
+  secondaryBtnFC: "#7892E8",
+  secondaryBtnBorderC: "#7892E8",
+  secondaryBtnBorderW: "2px",
+  secondaryBtnRadius: "8px",
+  // Markdown
+  markdownBg: "#15171F",
+  markdownFS: "14px",
+  markdownFW: "400",
+  markdownFC: "#E1E6F5",
+  markdownTitleFS: "14px",
+  markdownTitleFW: "500",
+  markdownTitleFC: "#E1E6F5",
+  markdownBorderW: "1px",
+  markdownRadius: "8px",
+  markdownBorderC: "#262A38",
+  markdownScrollbarC: "#4B5266",
+  // Wallet address
+  walletBg: "#1F232E",
+  walletFS: "12px",
+  walletFW: "400",
+  walletFC: "#E1E6F5",
+  walletBorderC: "transparent",
+  walletBorderW: "0",
+  walletRadius: "80px",
+  // Details of offering
+  detailsBg: "#15171F",
+  detailsTitleFS: "16px",
+  detailsTitleFW: "500",
+  detailsTitleFC: "#E1E6F5",
+  detailsSubtitleFS: "16px",
+  detailsSubtitleFW: "400",
+  detailsSubtitleFC: "#E1E6F5",
+  detailsRadius: "8px",
+  detailsBorderW: "1px",
+  detailsBorderC: "#262A38",
+  detailsAmountFC: "#7892E8",
+  detailsAmountFW: "500",
+  // Overlay
+  overlayWaitingBg: "#15171F",
+  overlayBg: "#1F232ECC",
+  overlayFS: "16px",
+  overlayFW: "400",
+  overlayFC: "#E1E6F5",
+  loaderBg: "#4B6DDE",
+  // Optout \ Turn off
+  optoutBg: "#15171F",
+  optoutFS: "16px",
+  optoutFW: "400",
+  optoutFC: "#E1E6F5",
+  optoutRadius: "4px",
+  // X Button and close buttons
+  closeFS: "12px",
+  closeFW: "400",
+  closeFC: "#E1E6F5",
+  // Token name
+  tokenBg: "#1F253B",
+  tokenFS: "14px",
+  tokenFW: "500",
+  tokenFC: "#7892E8",
+  tokenBorderW: "0",
+  tokenBorderC: "transparent",
+  tokenRadius: "80px",
+  // Notification popup
+  notificationFS: "16px",
+  notificationFW: "400",
+  notificationFC: "#E1E6F5",
+  notificationBtnBg: "#15171F",
+  notificationBtnFS: "14px",
+  notificationBtnFW: "500",
+  notificationBtnFC: "#7892E8",
+  notificationBtnBorderW: "2px",
+  notificationBtnBorderC: "#7892E8",
+  notificationBtnRadius: "8px",
+  // Activate title
+  activateTitleFS: "16px",
+  activateTitleFW: "400",
+  activateTitleFC: "#E1E6F5",
+  activateTitleBoldFS: "16px",
+  activateTitleBoldFW: "500",
+  activateTitleBoldFC: "#E1E6F5",
+});
+
+const lightTheme = Object.freeze({
+
+  // Popup
+  popupBg: "#FFFFFF",
+  popupShadow: "0px 6px 20px 0px rgba(0, 0, 0, 0.10), 0px 1px 8px 0px rgba(0, 0, 0, 0.06)",
+  xBtnFC: "#242838",
+  // Primary button
+  primaryBtnBg: "#4B6DDE",
+  primaryBtnFC: "#FFFFFF",
+  primaryBtnFW: "500",
+  primaryBtnFS: "16px",
+  primaryBtnBorderC: "transparent",
+  primaryBtnBorderW: "0",
+  primaryBtnRadius: "8px",
+  // Secondary button
+  secondaryBtnBg: "#FFFFFF",
+  secondaryBtnFS: "14px",
+  secondaryBtnFW: "500",
+  secondaryBtnFC: "#4B6DDE",
+  secondaryBtnBorderC: "#4B6DDE",
+  secondaryBtnBorderW: "2px",
+  secondaryBtnRadius: "8px",
+  // Markdown
+  markdownBg: "#FFFFFF",
+  markdownFS: "14px",
+  markdownFW: "400",
+  markdownFC: "#242838",
+  markdownTitleFS: "14px",
+  markdownTitleFW: "500",
+  markdownTitleFC: "#242838",
+  markdownBorderW: "1px",
+  markdownRadius: "8px",
+  markdownBorderC: "#DCE0E9",
+  markdownScrollbarC: "#A7AFC0",
+  // Wallet address
+  walletBg: "#EAEDF2",
+  walletFS: "12px",
+  walletFW: "400",
+  walletFC: "#242838",
+  walletBorderC: "transparent",
+  walletBorderW: "0",
+  walletRadius: "80px",
+  // Details of offering
+  detailsBg: "#FFFFFF",
+  detailsTitleFS: "16px",
+  detailsTitleFW: "500",
+  detailsTitleFC: "#242838",
+  detailsSubtitleFS: "16px",
+  detailsSubtitleFW: "400",
+  detailsSubtitleFC: "#242838",
+  detailsRadius: "8px",
+  detailsBorderW: "1px",
+  detailsBorderC: "#DCE0E9",
+  detailsAmountFC: "#4B6DDE",
+  detailsAmountFW: "500",
+  // Overlay
+  overlayWaitingBg: "#FFFFFF",
+  overlayBg: "#0000007A",
+  overlayFS: "16px",
+  overlayFW: "400",
+  overlayFC: "#242838",
+  loaderBg: "#4B6DDE",
+  // Optout \ Turn off
+  optoutBg: "#FFFFFF",
+  optoutFS: "16px",
+  optoutFW: "400",
+  optoutFC: "#242838",
+  optoutRadius: "4px",
+  // X Button and close buttons
+  closeFS: "12px",
+  closeFW: "400",
+  closeFC: "#242838",
+  // Token name
+  tokenBg: "#E4E8F7",
+  tokenFS: "14px",
+  tokenFW: "500",
+  tokenFC: "#4B6DDE",
+  tokenBorderW: "0",
+  tokenBorderC: "transparent",
+  tokenRadius: "80px",
+  // Notification popup
+  notificationFS: "16px",
+  notificationFW: "400",
+  notificationFC: "#242838",
+  notificationBtnBg: "#FFFFFF",
+  notificationBtnFS: "14px",
+  notificationBtnFW: "500",
+  notificationBtnFC: "#4B6DDE",
+  notificationBtnBorderW: "2px",
+  notificationBtnBorderC: "#4B6DDE",
+  notificationBtnRadius: "8px",
+  // Activate title
+  activateTitleFS: "16px",
+  activateTitleFW: "400",
+  activateTitleFC: "#242838",
+  activateTitleBoldFS: "16px",
+  activateTitleBoldFW: "500",
+  activateTitleBoldFC: "#242838",
+});
+
+(async () => {
+  await bringInitContentScript({
+    getWalletAddress: getFirstAddress,
+    promptLogin: promptCreationOrSelection,
+    walletAddressUpdateCallback: listenForCashbackWalletChange,
+    theme: await getTheme(),
+    lightTheme,
+    darkTheme,
+    text: 'upper',
+    switchWallet: true
+  });
+})().catch(console.error);
diff --git a/packages/yoroi-extension/chrome/content-scripts/bringLib.js b/packages/yoroi-extension/chrome/content-scripts/bringLib.js
new file mode 100644
index 0000000000..68116e9932
--- /dev/null
+++ b/packages/yoroi-extension/chrome/content-scripts/bringLib.js
@@ -0,0 +1,81 @@
+// @flow
+declare var chrome;
+
+// We pass the RPC call inject.js and have it relay the request and reponse messages to the background,
+// instead of directly calling the background with chrome.runtime.sendMessage, so that this lib can also
+// be used in the web page process.
+const callbacks: Map<number, (Object) => void> = new Map();
+let uid = 0;
+
+window.addEventListener('message', (event) => {
+  if (event.data.type === 'bring_rpc_response') {
+    const callback = callbacks.get(event.data.uid);
+    if (callback) {
+      callbacks.delete(event.data.uid);
+      callback(event.data);
+    }
+  }
+});
+
+function callBackground(functionName: string, params: any): Promise<any> {
+  return new Promise((resolve, reject) => {
+    callbacks.set(uid, (msg) => {
+      if (msg.return.err) {
+        reject(new Error(msg.return.err));
+      } else {
+        resolve(msg.return.ok);
+      }
+    });
+
+    window.postMessage({
+      type: 'bring_rpc_request',
+      url: location.hostname,
+      uid,
+      function: functionName,
+      params,
+    });
+    uid += 1;
+  });
+}
+
+export async function getFirstAddress(): Promise<string | typeof undefined> {
+  return await callBackground('get-address');
+}
+
+export function getTheme(): Promise<'light' | 'dark'> {
+  return callBackground('get-theme-mode');
+}
+
+export function popUpWalletCreation(): void {
+  callBackground('pop-up-wallet-creation');
+}
+
+export function popUpCashbackWalletSelection(): void {
+  callBackground('pop-up-cashback-wallet-selection');
+}
+
+export async function promptCreationOrSelection(): Promise<void> {
+  const address = await getFirstAddress();
+  if (address === null) {
+    return await popUpWalletCreation();
+  } else {
+    return await popUpCashbackWalletSelection();
+  }
+}
+
+export function listenForCashbackWalletChange(callback: () => void): void {
+  // todo: verify sender extension id
+  chrome.runtime.onMessage.addListener((msg, sender) => {
+    if (msg.type === 'cashback-wallet-change') {
+      callback();
+    }
+  });
+}
+
+export async function getWallets(): Promise<Array<{| id: number, name: string, address: string, |}>> {
+  return callBackground('get-wallets');
+}
+
+export async function setCashbackWallet(id: number): Promise<void> {
+  return callBackground('set-cashback-wallet', id);
+}
diff --git a/packages/yoroi-extension/chrome/content-scripts/inject.js b/packages/yoroi-extension/chrome/content-scripts/inject.js
index 62e2e66227..465fb8ded9 100644
--- a/packages/yoroi-extension/chrome/content-scripts/inject.js
+++ b/packages/yoroi-extension/chrome/content-scripts/inject.js
@@ -212,6 +212,8 @@ async function connectorEventListener(event) {
         await handleConnectorConnectRequest(event, protocol);
     } else if (dataType === 'scripted_injected') {
         resolveScriptedInject();
+    } else if (dataType === 'bring_rpc_request') {
+      await chrome.runtime.sendMessage(event.data);
     }
 }
 
@@ -267,3 +269,10 @@ window.addEventListener('message', function (event) {
     chrome.runtime.sendMessage(event.data);
   }
 });
+
+// relay message from background to Bring
+chrome.runtime.onMessage.addListener((message) => {
+  if (message.type === 'bring_rpc_response') {
+    window.postMessage(message, location.origin);
+  }
+});
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js b/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
new file mode 100644
index 0000000000..e80e2964e1
--- /dev/null
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
@@ -0,0 +1,125 @@
+// @flow
+import LocalStorageApi from '../../../../../app/api/localStorage';
+import { isTrezorTWallet } from '../../../../../app/api/ada/lib/storage/models/ConceptualWallet/index';
+import { getAllAddressesForDisplay } from '../../../../../app/api/ada/lib/storage/bridge/traitUtils';
+import { PublicDeriver, } from '../../../../../app/api/ada/lib/storage/models/PublicDeriver/index';
+import { getDb } from '../../state';
+import { loadWalletsFromStorage } from '../../../../../app/api/ada/lib/storage/models/load';
+import { notifyAllTabsCashbackWalletChange } from '../yoroi/utils';
+import { getBoundsForTabWindow, popupProps, sendToInjector } from './utils';
+import { CoreAddressTypes } from '../../../../../app/api/ada/lib/storage/database/primitives/enums';
+
+declare var chrome;
+
+const handlers = Object.freeze({
+  'get-theme-mode': async () => {
+    const localStorageApi = new LocalStorageApi();
+    let theme = await localStorageApi.getUserThemeMode();
+    if (theme !== 'light' && theme !== 'dark') {
+      theme = 'light';
+    }
+    return { ok: theme };
+  },
+
+  'pop-up-wallet-creation': async () => {
+    chrome.tabs.create({ url: 'main_window.html#/wallets/add' });
+    return { ok: undefined };
+  },
+
+  'pop-up-cashback-wallet-selection': async (_: void, tabId: number) => {
+    const bounds = await getBoundsForTabWindow(tabId);
+    chrome.windows.create({
+      ...popupProps,
+      url: chrome.runtime.getURL('main_window_connector.html#/select-cashback-wallet'),
+      left: (bounds.width + bounds.positionX) - popupProps.width,
+      top: bounds.positionY + 80,
+    });
+    return { ok: undefined };
+  },
+
+  'get-address': async () => {
+    const publicDeriver = await getCashbackWallet();
+    if (!publicDeriver) {
+      return { ok: publicDeriver };
+    }
+    const { address } = (await getAllAddressesForDisplay({ publicDeriver, type: CoreAddressTypes.CARDANO_BASE }))[0];
+    return { ok: address };
+  },
+
+  'get-wallets': async () => {
+    const db = await getDb();
+    const publicDerivers = await loadWalletsFromStorage(db);
+    const result = [];
+    for (const publicDeriver of publicDerivers) {
+      if (!isTrezorTWallet(publicDeriver.getParent())) {
+        result.push({
+          id: publicDeriver.getPublicDeriverId(),
+          address: (await getAllAddressesForDisplay({ publicDeriver, type: CoreAddressTypes.CARDANO_BASE }))[0].address,
+          name: (await publicDeriver.getParent().getFullConceptualWalletInfo()).Name
+        });
+      }
+    }
+    return { ok: result };
+  },
+
+  'set-cashback-wallet': async (id: number) => {
+    const localStorageApi = new LocalStorageApi();
+    await localStorageApi.saveCashbackWalletId(id);
+
+    notifyAllTabsCashbackWalletChange()
+    return { ok: undefined };
+  },
+});
+
+// return a wallet if either there is a saved cashback wallet or there is only one wallet
+// return null if there is no wallet
+// return undefines if there is no saved cashback wallet but there are multiple wallets
+async function getCashbackWallet(): Promise<PublicDeriver<> | null | void> {
+  const db = await getDb();
+  const publicDerivers = (await loadWalletsFromStorage(db)).filter(publicDeriver =>
+    !isTrezorTWallet(publicDeriver.getParent())
+  );
+  if (!publicDerivers.length) {
+    return null;
+  }
+
+  // try to load saved cashback wallet
+  const localStorageApi = new LocalStorageApi();
+  const savedCashbackWalletId = await localStorageApi.getCashbackWalletId();
+  const savedCashbackWallet = publicDerivers.find(publicDeriver =>
+    publicDeriver.getPublicDeriverId() === savedCashbackWalletId
+  );
+  if (savedCashbackWallet) {
+    return savedCashbackWallet;
+  }
+
+  // if there is one and only wallet use it as the cashback wallet
+  if (publicDerivers.length === 1) {
+    await localStorageApi.saveCashbackWalletId(publicDerivers[0].getPublicDeriverId());
+    return publicDerivers[0];
+  }
+
+  return undefined;
+}
+
+function sendRpcResponse(response: Object, tabId: number, messageUid: number) {
+  sendToInjector(
+    tabId,
+    {
+      type: 'bring_rpc_response',
+      uid: messageUid,
+      return: response,
+    }
+  );
+}
+
+export async function handleBringRpc(message: Object, sender: Object) {
+  const handler = handlers[message.function];
+  
+  if (!handler) {
+    throw new Error('missing Bring handler for ' + message.function);
+  }
+
+  const result = await handler(message.params, sender.tab.id);
+  sendRpcResponse(result, sender.tab.id, message.uid);
+}
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/content/index.js b/packages/yoroi-extension/chrome/extension/background/handlers/content/index.js
index 8a7a8dc3b2..f4848bccfa 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/content/index.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/content/index.js
@@ -1,6 +1,7 @@
 // @flow
 import { handleRpc } from './rpc';
 import { handleConnect } from './connect';
+import { handleBringRpc } from './bring';
 import { stringifyError } from '../../../../../app/utils/logging';
 import { sendToInjector } from './utils';
 
@@ -22,6 +23,8 @@ export async function handleInjectorMessage(message: Object, sender: Object) {
     }
   } else if (message.type === 'connector_rpc_request') {
     await handleRpc(message, sender);
+  } else if (message.type === 'bring_rpc_request') {
+    await handleBringRpc(message, sender);
   }
 }
 
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/utils.js b/packages/yoroi-extension/chrome/extension/background/handlers/utils.js
index 73a18d7051..8000ff49e6 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/utils.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/utils.js
@@ -24,19 +24,24 @@ import {
 import { getForeignAddresses } from '../../../../app/api/ada/lib/storage/bridge/updateTransactions';
 import { isLedgerNanoWallet, isTrezorTWallet } from '../../../../app/api/ada/lib/storage/models/ConceptualWallet/index';
 import { Bip44Wallet } from '../../../../app/api/ada/lib/storage/models/Bip44Wallet/wrapper';
-import { isCardanoHaskell, isTestnet, } from '../../../../app/api/ada/lib/storage/database/prepackaged/networks';
+import {
+  isCardanoHaskell,
+  isTestnet,
+  getNetworkById
+} from '../../../../app/api/ada/lib/storage/database/prepackaged/networks';
 import BigNumber from 'bignumber.js';
 import { asAddressedUtxo, cardanoValueFromRemoteFormat, } from '../../../../app/api/ada/transactions/utils';
 import { MultiToken } from '../../../../app/api/common/lib/MultiToken';
 import { RustModule } from '../../../../app/api/ada/lib/cardanoCrypto/rustLoader';
 import { loadSubmittedTransactions } from '../../../../app/api/localStorage';
-import { getDb } from '../state/databaseManager';
 // eslint-disable-next-line import/no-cycle
 import { refreshingWalletIdSet } from '../state/refreshScheduler';
 import { loadWalletsFromStorage } from '../../../../app/api/ada/lib/storage/models/load';
 import { getProtocolParameters } from './yoroi/protocolParameters';
+import AdaApi from '../../../../app/api/ada';
+import { getDb, syncWallet } from '../state';
 
-export async function getWalletsState(publicDeriverId: ?number): Promise<Array<WalletState>> {
+export async function getWalletsState(publicDeriverId: ?number, targetNetworkId: ?number): Promise<Array<WalletState>> {
   const db = await getDb();
   let publicDerivers = await loadWalletsFromStorage(db);
   if (publicDeriverId != null) {
@@ -47,7 +52,47 @@ export async function getWalletsState(publicDeriverId: ?number): Promise<Array<W
     publicDerivers = publicDeriver ? [publicDeriver] : [];
   }
 
-  const maybeWalletStates = await Promise.all(publicDerivers.map(async publicDeriver => {
+  let publicDeriversOfNetwork;
+  if (publicDeriverId == null && targetNetworkId != null) {
+    publicDeriversOfNetwork = [];
+    // group wallets by staking key
+    const publicDeriversByPublicKey = new Map<string, Array<PublicDeriver<>>>;
+    for (const publicDeriver of publicDerivers) {
+      const withPublicKey = asGetPublicKey(publicDeriver);
+      if (withPublicKey == null) {
+        throw new Error('unexpected missing public key');
+      }
+      const key = (await withPublicKey.getPublicKey()).Hash;
+      let value = publicDeriversByPublicKey.get(key);
+      if (!value) {
+        value = [];
+        publicDeriversByPublicKey.set(key, value);
+      }
+      value.push(publicDeriver);
+    }
+    // for each staking key, either find an existing wallet or clone one
+    for (const value of publicDeriversByPublicKey.values()) {
+      let found = false;
+      for (const publicDeriver of value) {
+        if (publicDeriver.getParent().getNetworkInfo().NetworkId === targetNetworkId) {
+          publicDeriversOfNetwork.push(publicDeriver);
+          found = true;
+          break;
+        }
+      }
+      if (!found) {
+        const network = getNetworkById(targetNetworkId);
+        const adaApi = new AdaApi();
+        const clonedWallet = await adaApi.cloneWallet(db, value[0], network);
+        publicDeriversOfNetwork.push(clonedWallet);
+        syncWallet(clonedWallet, 'cloned wallet').catch(console.error);
+      }
+    }
+  } else {
+    publicDeriversOfNetwork = publicDerivers;
+  }
+
+  const maybeWalletStates = await Promise.all(publicDeriversOfNetwork.map(async publicDeriver => {
     try {
       return await getWalletState(publicDeriver);
     } catch (err) {
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/connector.js b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/connector.js
index ca804b84c8..1b2c08d158 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/connector.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/connector.js
@@ -448,7 +448,6 @@ export const RemoveWalletFromWhiteList: HandlerType<
       const site = connectedSites[tabId];
       if (site.url === request.url) {
         sendToInjector(Number(tabId), { type: 'disconnect' });
-        break;
       }
     }
   },
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/utils.js b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/utils.js
index bd914dbfff..9f6c5372d9 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/utils.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/utils.js
@@ -12,3 +12,17 @@ export async function getPublicDeriverById(publicDeriverId: number): Promise<Pub
   }
   throw new Error(`missing public deriver ${publicDeriverId}`);
 }
+
+export function notifyAllTabsCashbackWalletChange() {
+  declare var chrome;
+  chrome.tabs.query({}, (tabs) => {
+    for (const tab of tabs) {
+      chrome.tabs.sendMessage(
+        tab.id,
+        {
+          type: 'cashback-wallet-change',
+        }
+      );
+    }
+  });
+}
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/wallet.js b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/wallet.js
index a7053b9f17..01147dc56d 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/wallet.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/wallet.js
@@ -13,7 +13,7 @@ import { getCardanoStateFetcher } from '../../utils';
 import LocalStorageApi, {
   loadSubmittedTransactions, persistSubmittedTransactions
 } from '../../../../../app/api/localStorage';
-import { getPublicDeriverById } from './utils';
+import { getPublicDeriverById, notifyAllTabsCashbackWalletChange } from './utils';
 import { removePublicDeriver } from '../../../../../app/api/ada/lib/storage/bridge/walletBuilder/remove';
 import { loadWalletsFromStorage } from '../../../../../app/api/ada/lib/storage/models/load';
 import {
@@ -21,6 +21,7 @@ import {
   asGetSigningKey,
   asGetAllAccounting,
   asHasLevels,
+  asGetPublicKey,
 } from '../../../../../app/api/ada/lib/storage/models/PublicDeriver/traits';
 import {
   removeAllTransactions,
@@ -29,6 +30,8 @@ import type { ReferenceTransaction, BaseGetTransactionsRequest } from '../../../
 import WalletTransaction from '../../../../../app/domain/WalletTransaction';
 import type { AdaGetTransactionsRequest } from '../../../../../app/api/ada';
 import { updateProtocolParametersCacheFromNetwork } from './protocolParameters';
+import { isTrezorTWallet } from '../../../../../app/api/ada/lib/storage/models/ConceptualWallet';
+import type { PublicDeriver, } from '../../../../../app/api/ada/lib/storage/models/PublicDeriver';
 
 type CreateWalletRequest = {|
   networkId: number,
@@ -57,16 +60,18 @@ export const CreateWallet: HandlerType<CreateWalletRequest, CreateWalletResponse
       walletPassword: request.walletPassword,
       accountIndex: request.accountIndex,
     });
+    const publicDeriverId = publicDerivers[0].getPublicDeriverId();
 
     emitUpdateToSubscriptions({
       type: 'wallet-state-update',
       params: {
         eventType: 'new',
-        publicDeriverId: publicDerivers[0].getPublicDeriverId(),
+        publicDeriverId,
       }
     });
     // noinspection ES6MissingAwait
     syncWallet(publicDerivers[0], 'new wallet', 1);
+    maybeNotifyCashbackWalletChange(publicDerivers[0]);
     return await getPlaceHolderWalletState(publicDerivers[0]);
   },
 });
@@ -92,8 +97,6 @@ export const CreateHardwareWallet: HandlerType<
 
     const db = await getDb();
 
-    const stateFetcher = await getCardanoStateFetcher(new LocalStorageApi());
-
     const adaApi = new AdaApi();
     const { publicDeriver } = await adaApi.createHardwareWallet({
       db,
@@ -101,23 +104,33 @@ export const CreateHardwareWallet: HandlerType<
       walletName: request.walletName,
       publicKey: request.publicKey,
       hwFeatures: request.hwFeatures,
-      checkAddressesInUse: stateFetcher.checkAddressesInUse,
       addressing: request.addressing,
     });
+    const publicDeriverId = publicDeriver.getPublicDeriverId();
 
     emitUpdateToSubscriptions({
       type: 'wallet-state-update',
       params: {
         eventType: 'new',
-        publicDeriverId: publicDeriver.getPublicDeriverId(),
+        publicDeriverId,
       }
     });
-    syncWallet(publicDeriver, 'new wallet', 1);
-
+    await syncWallet(publicDeriver, 'new wallet', 1);
+    maybeNotifyCashbackWalletChange(publicDeriver);
     return await getPlaceHolderWalletState(publicDeriver);
   },
 });
 
+function maybeNotifyCashbackWalletChange(newWallet: PublicDeriver<>) {
+  (async () => {
+    const db = await getDb();
+    const publicDerivers = await loadWalletsFromStorage(db);
+    if (publicDerivers.length === 1 && !isTrezorTWallet(newWallet.getParent())) {
+      notifyAllTabsCashbackWalletChange();
+    }
+  })().catch(console.error);
+}
+
 export const RemoveWallet: HandlerType<
   {| publicDeriverId: number |},
   void,
@@ -125,12 +138,27 @@ export const RemoveWallet: HandlerType<
   typeTag: 'remove-wallet',
 
   handle: async (request) => {
-    const publicDeriver = await getPublicDeriverById(request.publicDeriverId);
+    const removeKey = await (async () => {
+      const publicDeriver = await getPublicDeriverById(request.publicDeriverId);
+      const withPublicKey = asGetPublicKey(publicDeriver);
+      if (withPublicKey == null) {
+        throw new Error('unexpected missing public key');
+      }
+      return (await withPublicKey.getPublicKey()).Hash;
+    })();
 
-    await removePublicDeriver({
-      publicDeriver,
-      conceptualWallet: publicDeriver.getParent(),
-    });
+    for (const publicDeriver of await loadWalletsFromStorage(await getDb())) {
+      const withPublicKey = asGetPublicKey(publicDeriver);
+      if (withPublicKey == null) {
+        throw new Error('unexpected missing public key');
+      }
+      if ((await withPublicKey.getPublicKey()).Hash === removeKey) {
+        await removePublicDeriver({
+          publicDeriver,
+          conceptualWallet: publicDeriver.getParent(),
+        });
+      }
+    }
 
     emitUpdateToSubscriptions({
       type: 'wallet-state-update',
@@ -139,6 +167,11 @@ export const RemoveWallet: HandlerType<
         publicDeriverId: request.publicDeriverId,
       }
     });
+
+    const localStorageApi = new LocalStorageApi();
+    if (await localStorageApi.getCashbackWalletId() === request.publicDeriverId) {
+      notifyAllTabsCashbackWalletChange();
+    }
   },
 });
 
@@ -171,13 +204,13 @@ export const RenameConceptualWallet: HandlerType<
 });
 
 export const GetWallets: HandlerType<
-  {| walletId: ?number |},
+  {| networkId: number |},
   Array<WalletState>,
 > = Object.freeze({
   typeTag: 'get-wallets',
 
   handle: async (request) => {
-    return await getWalletsState(request.walletId);
+    return await getWalletsState(undefined, request.networkId);
   },
 });
 
diff --git a/packages/yoroi-extension/chrome/extension/background/index.js b/packages/yoroi-extension/chrome/extension/background/index.js
index feadd12e9f..bc710571fd 100644
--- a/packages/yoroi-extension/chrome/extension/background/index.js
+++ b/packages/yoroi-extension/chrome/extension/background/index.js
@@ -6,10 +6,15 @@ import { init } from './state';
 import { startMonitorServerStatus } from './serverStatus';
 import { startPoll } from './coinPrice';
 import { environment } from '../../../app/environment';
+import { bringInitBackground } from '@bringweb3/chrome-extension-kit';
 import axios from 'axios';
 import fetchAdapter from '@vespaiach/axios-fetch-adapter';
 import { sanitizeForLog } from '../../../app/coreUtils';
 import LocalStorageApi from '../../../app/api/localStorage/index';
+import type { ConfigType } from '../../../config/config-types';
+
+// populated by ConfigWebpackPlugin
+declare var CONFIG: ConfigType;
 
 axios.defaults.adapter = fetchAdapter;
 
@@ -18,6 +23,12 @@ declare var chrome;
 declare var browser;
 */
 
+bringInitBackground({
+  identifier: CONFIG.bring.identifier,
+  apiEndpoint: CONFIG.bring.apiEndpoint,
+  cashbackPagePath: '/main_window.html#/cashback'
+});
+
 const onYoroiIconClicked = () => {
   chrome.tabs.create({ url: 'main_window.html' });
 };
@@ -49,7 +60,6 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
   }
   return handleInjectorMessage(message, sender);
 });
-
 init().catch(console.error);
 startMonitorServerStatus();
 startPoll();
diff --git a/packages/yoroi-extension/chrome/extension/background/state/index.js b/packages/yoroi-extension/chrome/extension/background/state/index.js
index c16b876d5b..109516551b 100644
--- a/packages/yoroi-extension/chrome/extension/background/state/index.js
+++ b/packages/yoroi-extension/chrome/extension/background/state/index.js
@@ -2,6 +2,7 @@
 import { getDb } from './databaseManager';
 
 export { getDb };
+// eslint-disable-next-line import/no-cycle
 export { refreshingWalletIdSet, syncWallet } from './refreshScheduler';
 
 export async function init(): Promise<void> {
diff --git a/packages/yoroi-extension/chrome/manifest-mv2.template.js b/packages/yoroi-extension/chrome/manifest-mv2.template.js
index b7ed82c466..d7987b7e4a 100644
--- a/packages/yoroi-extension/chrome/manifest-mv2.template.js
+++ b/packages/yoroi-extension/chrome/manifest-mv2.template.js
@@ -68,6 +68,8 @@ export default ({
     },
     permissions: [
       'storage',
+      'alarms',
+      'tabs',
       '*://connect.trezor.io/*',
       'https://emurgo.github.io/yoroi-extension-ledger-connect-vnext/*'
     ],
@@ -76,6 +78,16 @@ export default ({
         matches: ['*://connect.trezor.io/*/popup.html*'],
         js: ['js/trezor-content-script.js'],
       },
+      {
+        matches: [
+          'http://*/*',
+          'https://*/*',
+        ],
+        js: [
+          'js/bringInject.js',
+        ],
+        run_at: 'document_start',
+      }
     ],
     content_security_policy: contentSecurityPolicy,
     protocol_handlers: !enableProtocolHandlers
@@ -87,7 +99,9 @@ export default ({
           uriTemplate: 'main_window.html#/send-from-uri?q=%s',
         },
       ],
-    web_accessible_resources: [],
+    web_accessible_resources: [
+      'js/bringInject.js',
+    ],
   };
 
   if (shouldInjectConnector) {
diff --git a/packages/yoroi-extension/chrome/manifest.template.js b/packages/yoroi-extension/chrome/manifest.template.js
index 2cd8114fae..5b4cf7fa6b 100644
--- a/packages/yoroi-extension/chrome/manifest.template.js
+++ b/packages/yoroi-extension/chrome/manifest.template.js
@@ -67,6 +67,8 @@ export default ({
     },
     permissions: [
       'storage',
+      'tabs',
+      'alarms',
       // so that the background service could access `chrome.system.display.width`
       'system.display',
     ],
@@ -78,6 +80,18 @@ export default ({
         matches: ['*://connect.trezor.io/*/popup.html*'],
         js: ['js/trezor-content-script.js'],
       },
+      {
+        matches: [
+          'file://*/*',
+          'http://*/*',
+          'https://*/*',
+        ],
+        js: [
+          'js/bringInject.js',
+        ],
+        run_at: 'document_start',
+        all_frames: true,
+      }
     ],
     content_security_policy: {
       extension_pages: contentSecurityPolicy
diff --git a/packages/yoroi-extension/config/config-types.js b/packages/yoroi-extension/config/config-types.js
index 64a6527571..8a60e1f8ab 100644
--- a/packages/yoroi-extension/config/config-types.js
+++ b/packages/yoroi-extension/config/config-types.js
@@ -4,11 +4,19 @@ export type ConfigType = {|
   network: NetworkConfigType,
   poolExplorer: PoolExplorerConfigType,
   app: AppConfigType,
+  bring: BringConfigType,
+  bringSandbox: BringConfigType,
+|};
+
+export type BringConfigType = {|
+  baseUrl: string,
+  identifier: string,
+  apiEndpoint: string,
 |};
 
 export type PoolExplorerConfigType = {|
-    simpleTemplate: string,
-|}
+  simpleTemplate: string,
+|};
 
 export type AppConfigType = {|
   walletRefreshInterval: number,
@@ -22,20 +30,20 @@ export type AppConfigType = {|
    * How long we should consider the "current price" valid.
    * If wallet has been unable to connect to the server (ex: wallet is offline)
    * We don't want to tell the user "this is the current price"
-  */
+   */
   coinPriceFreshnessThreshold: number,
   /** Public key we can use to make sure that the price information really dose come form EMURGO */
   pubKeyData: string,
   /** Public key to make sure that the ticker signing key change really does come from EMURGO */
   pubKeyMaster: string,
-|}
+|};
 
 export type NetworkConfigType = {|
   name: Network,
   priceBackendUrl: string,
 |};
 
-export type Network =  'development' | 'mainnet' | 'test';
+export type Network = 'development' | 'mainnet' | 'test';
 export const NetworkType: {|
   DEVELOPMENT: Network,
   MAINNET: Network,
diff --git a/packages/yoroi-extension/config/development.json b/packages/yoroi-extension/config/development.json
index 97c436b631..2bd642df45 100644
--- a/packages/yoroi-extension/config/development.json
+++ b/packages/yoroi-extension/config/development.json
@@ -17,5 +17,15 @@
     "coinPriceFreshnessThreshold": 900000,
     "pubKeyData": "0e011fe7149bff8e3802168261aec6da54febee37da6a41d6179fa545868421e",
     "pubKeyMaster": "ab9e4f1c4d996a0e9cdda8546bf5ee1dd8397fd7ab287c331ff171c7e4e0e9e2"
+  },
+  "bring": {
+    "baseUrl": "https://sandbox-api.bringweb3.io/v1/extension/",
+    "identifier": "G1TjqDrfxS8jhRYz15Sg2fMGsvZpdFF8IWgKe0g8",
+    "apiEndpoint": "sandbox"
+  },
+  "bringSandbox": {
+    "baseUrl": "https://sandbox-api.bringweb3.io/v1/extension/",
+    "identifier": "G1TjqDrfxS8jhRYz15Sg2fMGsvZpdFF8IWgKe0g8",
+    "apiEndpoint": "sandbox"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/yoroi-extension/config/mainnet.json b/packages/yoroi-extension/config/mainnet.json
index 14fa3fcc33..644d754025 100644
--- a/packages/yoroi-extension/config/mainnet.json
+++ b/packages/yoroi-extension/config/mainnet.json
@@ -16,5 +16,15 @@
     "coinPriceFreshnessThreshold": 900000,
     "pubKeyData": "0e011fe7149bff8e3802168261aec6da54febee37da6a41d6179fa545868421e",
     "pubKeyMaster": "ab9e4f1c4d996a0e9cdda8546bf5ee1dd8397fd7ab287c331ff171c7e4e0e9e2"
+  },
+  "bring": {
+    "baseUrl": "https://api.bringweb3.io/v1/extension/",
+    "identifier": "G1TjqDrfxS8jhRYz15Sg2fMGsvZpdFF8IWgKe0g8",
+    "apiEndpoint": "prod"
+  },
+  "bringSandbox": {
+    "baseUrl": "https://sandbox-api.bringweb3.io/v1/extension/",
+    "identifier": "G1TjqDrfxS8jhRYz15Sg2fMGsvZpdFF8IWgKe0g8",
+    "apiEndpoint": "sandbox"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/yoroi-extension/config/test.json b/packages/yoroi-extension/config/test.json
index 55733cd3cc..b8f2692aad 100644
--- a/packages/yoroi-extension/config/test.json
+++ b/packages/yoroi-extension/config/test.json
@@ -17,5 +17,15 @@
     "coinPriceFreshnessThreshold": 900000,
     "pubKeyData": "0e011fe7149bff8e3802168261aec6da54febee37da6a41d6179fa545868421e",
     "pubKeyMaster": "ab9e4f1c4d996a0e9cdda8546bf5ee1dd8397fd7ab287c331ff171c7e4e0e9e2"
+  },
+  "bring": {
+    "baseUrl": "https://sandbox-api.bringweb3.io/v1/extension/check/portal",
+    "identifier": "G1TjqDrfxS8jhRYz15Sg2fMGsvZpdFF8IWgKe0g8",
+    "apiEndpoint": "sandbox"
+  },
+  "bringSandbox": {
+    "baseUrl": "https://sandbox-api.bringweb3.io/v1/extension/",
+    "identifier": "G1TjqDrfxS8jhRYz15Sg2fMGsvZpdFF8IWgKe0g8",
+    "apiEndpoint": "sandbox"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/yoroi-extension/ledger/assets/img/illustration-hardware-extension.svg b/packages/yoroi-extension/ledger/assets/img/illustration-hardware-extension.svg
new file mode 100644
index 0000000000..3bdfb52200
--- /dev/null
+++ b/packages/yoroi-extension/ledger/assets/img/illustration-hardware-extension.svg
@@ -0,0 +1,140 @@
+<svg width="280" height="280" viewBox="0 0 280 280" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M161.362 193.115C162.897 193.115 164.142 194.343 164.142 195.858V260.453C164.142 261.968 162.897 263.196 161.362 263.196C159.827 263.196 158.582 261.968 158.582 260.453V195.858C158.582 194.343 159.827 193.115 161.362 193.115Z" fill="url(#paint0_linear_18611_133549)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M224.978 44.0461L206.331 21.3194C204.307 18.8411 201.536 18.5247 200.151 20.6339L154.385 90.8178C149.537 98.2528 151.455 111.435 158.648 120.189C165.84 128.942 175.59 129.996 180.438 122.561L226.204 52.3775C227.536 50.2683 227.003 46.5244 224.978 44.0461ZM161.098 116.392C154.279 108.904 151.775 98.2001 155.451 92.5579C159.127 86.9158 167.651 88.3922 174.418 95.8799C181.237 103.368 183.741 114.072 180.065 119.714C176.389 125.409 167.865 123.932 161.098 116.392Z" fill="url(#paint1_linear_18611_133549)"/>
+<path d="M152.895 186.894V197.493C152.895 198.6 153.481 199.602 154.44 200.182L164.882 207.353C167.546 207.67 169.464 206.035 169.464 203.715V194.962L152.895 186.894Z" fill="url(#paint2_linear_18611_133549)"/>
+<path d="M150.604 187.578V198.177C150.604 199.284 151.19 200.286 152.149 200.866L162.592 206.983C164.616 208.196 167.174 206.719 167.174 204.399V195.646L150.604 187.578Z" fill="url(#paint3_linear_18611_133549)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M164.348 93.2439C159.553 90.5547 155.664 92.7166 155.664 97.9897C155.664 103.263 159.553 109.749 164.348 112.385C169.143 115.074 173.033 112.912 173.033 107.639C173.033 102.366 169.143 95.8805 164.348 93.2439ZM177.668 207.616L151.562 188.211C148.205 186.313 145.488 181.831 145.488 178.14L142.345 75.6848C145.861 74.8411 152.627 74.1556 155.345 75.6848L179.959 89.3946C183.315 91.2929 186.033 95.775 186.033 99.4661V200.128C186.086 203.819 183.049 206.667 177.668 207.616Z" fill="url(#paint4_linear_18611_133549)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M160.778 94.6164C155.983 91.9271 152.094 94.0891 152.094 99.3621C152.094 104.635 155.983 111.121 160.778 113.757C165.573 116.447 169.463 114.285 169.463 109.012C169.463 103.739 165.573 97.2529 160.778 94.6164ZM174.524 206.826L146.127 191.007C142.77 189.109 140 184.627 140 180.936V79.641C140 75.9498 142.717 74.4734 146.074 76.3717L174.471 92.1908C177.827 94.089 180.544 98.5711 180.544 102.262V203.557C180.598 207.195 177.881 208.672 174.524 206.826Z" fill="url(#paint5_linear_18611_133549)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M167.383 191.744L152.146 183.254C149.908 181.989 148.097 178.983 148.097 176.557V135.375C148.097 132.897 149.908 131.948 152.146 133.16L167.383 141.65C169.621 142.916 171.432 145.921 171.432 148.347V189.529C171.486 192.007 169.621 192.956 167.383 191.744Z" fill="url(#paint6_linear_18611_133549)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M217.464 41.6744L198.71 19.0531C196.632 16.5748 193.915 16.3111 192.53 18.4203L147.137 88.8679C142.342 96.3556 144.313 109.485 151.559 118.186C158.805 126.886 168.555 127.888 173.35 120.453L218.742 50.0057C220.074 47.8965 219.488 44.1527 217.464 41.6744ZM155.874 111.331C151.026 106.058 149.215 98.5176 151.772 94.5101C154.329 90.5026 160.35 91.5044 165.198 96.7775C170.046 102.05 171.858 109.591 169.301 113.598C166.743 117.659 160.723 116.604 155.874 111.331Z" fill="url(#paint7_linear_18611_133549)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M194.661 17.0486C194.661 17.0486 201.694 16.5741 205.477 20.0543C207.341 21.7416 225.616 44.5738 225.616 44.5738C225.616 44.5738 227.8 47.8431 226.681 51.2706C226.681 51.2706 224.07 49.2141 218.796 49.5305C218.796 49.5305 220.448 45.2066 216.825 40.9882C213.735 37.297 199.882 20.5816 199.882 20.5816C199.882 20.5816 197.591 17.5759 194.661 17.0486Z" fill="url(#paint8_linear_18611_133549)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M170.687 124.883C169.781 125.357 165.785 125.357 165.785 125.357C165.785 125.357 167.757 125.252 169.888 123.881C171.859 122.615 172.818 121.192 174.363 118.766L218.797 49.4785C219.063 49.0566 219.543 48.793 220.076 48.793C220.875 48.793 222.153 48.8457 223.645 49.3203C224.924 49.6894 226.895 50.5858 226.682 51.2186C226.362 52.0622 225.616 53.2223 225.616 53.2223L186.084 113.862V111.12L224.764 52.5368C224.924 52.2732 224.817 51.9568 224.498 51.9041L221.461 51.1658C220.395 50.9022 219.276 51.324 218.69 52.2732L174.363 121.824C173.084 123.723 172.072 124.197 170.687 124.883Z" fill="url(#paint9_linear_18611_133549)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M179.795 68.6695C179.102 68.5641 178.463 68.9332 177.93 69.7769C177.664 70.146 177.504 70.4624 177.504 70.8842C177.344 71.2533 177.238 71.6751 177.131 72.1497L177.504 72.7298C177.596 72.2288 177.728 71.8458 177.831 71.5468C177.847 71.4997 177.862 71.4546 177.877 71.4115C177.983 71.0951 178.143 70.726 178.356 70.4096C178.836 69.7241 179.315 69.355 179.848 69.5132C180.381 69.6187 180.967 70.146 181.553 71.0424L178.889 75.3135L179.209 75.8408C179.795 76.79 180.381 77.3173 181.02 77.4755C181.606 77.5809 182.139 77.3173 182.565 76.6318C183.045 75.8408 183.205 74.8917 183.098 73.7844C182.992 72.677 182.565 71.5697 181.873 70.5151C181.18 69.4078 180.487 68.775 179.795 68.6695ZM182.565 74.1007C182.565 74.839 182.459 75.5245 182.086 76.1045C181.766 76.6318 181.393 76.79 180.914 76.6318C180.434 76.5263 179.955 76.0518 179.475 75.2608L181.766 71.6224C182.246 72.5188 182.512 73.3098 182.565 74.1007Z" fill="white"/>
+<path d="M178.516 82.643C178.729 82.4321 178.942 82.2212 179.102 81.9575C179.369 81.5357 179.528 81.1139 179.582 80.5338C179.635 80.112 179.582 79.4792 179.422 78.741V78.6883L180.221 79.8483L180.541 79.3738L176.225 72.677L175.852 73.2571L178.197 76.9482C178.676 77.7391 178.942 78.4773 179.049 79.321C179.156 80.112 179.049 80.7975 178.729 81.2721C178.569 81.5357 178.41 81.7466 178.197 81.9575L178.516 82.643Z" fill="white"/>
+<path d="M204.196 46.9974L201.692 50.9522C201.213 51.6904 200.36 51.5849 199.827 50.7412L196.95 46.2592L200.307 40.9334L204.196 46.9974Z" fill="white"/>
+<path d="M205.368 45.0464L204.942 45.7319L203.45 43.4117L204.729 41.3553L205.208 42.0935C205.794 42.9899 205.848 44.3082 205.368 45.0464Z" fill="white"/>
+<path d="M202.544 42.0408L203.823 39.9843L202.331 37.6642L201.053 39.7206L202.544 42.0408Z" fill="white"/>
+<path d="M195.459 41.1443L195.885 40.4589L197.377 42.779L196.098 44.8355L195.618 44.0972C195.032 43.2008 194.979 41.8826 195.459 41.1443Z" fill="white"/>
+<path d="M198.122 41.5662L199.401 39.5097L197.909 37.1896L196.631 39.2461L198.122 41.5662Z" fill="white"/>
+<path d="M200.946 35.5022L201.426 36.2404L200.147 38.3496L198.655 36.0295L199.081 35.344C199.561 34.5531 200.413 34.6585 200.946 35.5022Z" fill="white"/>
+<path d="M198.176 55.9099L192.368 46.8931L189.651 51.2697L190.024 51.8497L192.422 48.0531L197.803 56.49L198.176 55.9099Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M189.758 52.7988C189.065 52.6934 188.426 53.0625 187.893 53.9062C187.68 54.1698 187.467 54.5389 187.52 55.0135C187.36 55.3826 187.254 55.8045 187.147 56.279L187.52 56.8591C187.612 56.358 187.744 55.9751 187.847 55.6761C187.863 55.629 187.878 55.5839 187.893 55.5408C187.999 55.2244 188.159 54.8553 188.372 54.5389C188.852 53.8534 189.331 53.4843 189.864 53.6425C190.397 53.748 190.983 54.2753 191.569 55.1717L188.852 59.4428L189.172 59.9701C189.758 60.9193 190.344 61.4466 190.983 61.6048C191.569 61.7102 192.102 61.4466 192.528 60.7611C193.008 59.9701 193.167 59.021 193.061 57.9137C192.954 56.8063 192.528 55.699 191.835 54.6444C191.143 53.5371 190.45 52.9043 189.758 52.7988ZM192.581 58.1246C192.581 58.8628 192.475 59.5483 192.102 60.1283C191.782 60.6556 191.356 60.8666 190.93 60.6556C190.45 60.5502 189.971 60.0756 189.491 59.2847L191.782 55.6463C192.262 56.5427 192.528 57.3336 192.581 58.1246Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M188.372 66.6669C188.639 66.5087 188.958 66.245 189.225 65.8232C189.704 65.0323 189.917 64.1358 189.864 63.134C189.704 62.0794 189.278 60.972 188.532 59.812C187.786 58.7046 187.147 58.0191 186.508 57.9137C185.815 57.7555 185.282 58.0719 184.75 58.9155C184.217 59.7592 184.057 60.8138 184.27 62.0266L183.524 61.1302L183.311 61.4993L189.491 71.149L189.811 70.6217L188.266 68.1961C187.946 67.6688 187.627 67.1942 187.254 66.6669V66.6142C187.68 66.7723 188.053 66.7724 188.372 66.6669ZM189.278 63.0285C189.385 63.9249 189.225 64.6631 188.852 65.2959C188.426 65.9814 187.999 66.2978 187.52 66.0341C187.04 65.9287 186.454 65.3486 185.815 64.294L185.762 64.1886C185.069 63.134 184.75 62.2376 184.643 61.4993C184.536 60.7611 184.696 60.0756 185.122 59.3901C185.922 58.0719 186.934 58.3882 188.159 60.2865C188.799 61.2884 189.172 62.1848 189.278 63.0285Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M183.684 73.5218L183.95 73.9437L185.176 71.9926C185.314 71.9016 185.491 71.6536 185.709 71.3501C185.743 71.3019 185.779 71.2523 185.815 71.2017C186.241 70.5689 186.401 69.8834 186.401 69.0925C186.348 68.3543 186.135 67.616 185.709 66.9305C185.389 66.5087 185.069 66.1923 184.75 66.0341C184.377 65.8759 184.057 65.9287 183.737 66.0869C183.791 65.2432 183.684 64.5577 183.418 64.1358C183.311 63.9249 183.151 63.8195 182.991 63.7667C182.885 63.714 182.672 63.7667 182.512 63.8195C182.725 63.2922 182.778 62.7121 182.778 62.1848C182.778 61.6575 182.618 61.1302 182.299 60.6556C181.979 60.0756 181.553 59.812 181.073 59.9174C180.594 60.0229 180.114 60.4447 179.635 61.1829C179.049 62.1321 178.676 63.0285 178.623 63.9249C178.569 64.7686 178.729 65.5596 179.209 66.2978C179.582 66.8778 180.008 67.1415 180.381 67.0887C180.807 67.036 181.233 66.6669 181.606 66.0341L182.245 65.0323C182.459 64.6631 182.618 64.5049 182.778 64.4522C182.938 64.3995 183.045 64.5049 183.204 64.7159C183.364 64.9268 183.418 65.1377 183.471 65.4541C183.471 65.7177 183.471 66.0341 183.418 66.4032C183.364 66.456 183.204 66.6669 183.045 66.9305C182.618 67.5633 182.459 68.2488 182.459 69.0397C182.459 69.8307 182.672 70.5162 183.098 71.2017C183.418 71.729 183.844 72.0454 184.377 72.2036L183.684 73.5218ZM179.955 61.7102C180.7 60.4975 181.393 60.392 181.979 61.2884C182.565 62.2376 182.565 63.2922 181.873 64.3995L181.286 65.3486C180.967 65.8759 180.647 66.1923 180.381 66.245C180.114 66.2978 179.848 66.1396 179.582 65.7177C178.836 64.6104 178.996 63.2394 179.955 61.7102ZM184.323 66.7196C184.696 66.7196 185.069 66.9833 185.389 67.5106C185.709 68.0379 185.922 68.6179 185.922 69.1979C185.975 69.778 185.868 70.3053 185.549 70.7799C185.229 71.2544 184.909 71.4653 184.536 71.4653C184.217 71.4653 183.844 71.2017 183.471 70.6217C183.151 70.0416 182.938 69.5671 182.938 68.987C182.885 68.4597 183.045 67.8797 183.364 67.4051C183.631 66.9305 183.95 66.7196 184.323 66.7196Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M98.5 151C99.8807 151 101 152.163 101 153.599V214.401C101 215.837 99.8807 217 98.5 217C97.1193 217 96 215.837 96 214.401V153.599C96 152.163 97.1193 151 98.5 151Z" fill="url(#paint10_linear_18611_133549)"/>
+<path d="M94.0378 153.865V159.982C94.0378 160.626 94.3632 161.212 94.9251 161.534L100.958 165.661C102.496 165.837 103.591 164.9 103.591 163.553V158.519L94.0378 153.865Z" fill="url(#paint11_linear_18611_133549)"/>
+<path d="M92.7388 154.274V160.392C92.7388 161.036 93.0641 161.621 93.626 161.943L99.6593 165.485C100.842 166.158 102.321 165.339 102.321 163.992V158.958L92.7388 154.274Z" fill="url(#paint12_linear_18611_133549)"/>
+<path d="M131.658 96.4927C131.658 92.5704 128.346 87.565 124.205 85.2526L78.5707 60.021C75.1105 57.972 68.2195 59.6405 68.2195 59.6405L70.0531 110.514C70.0236 111.919 70.408 113.528 71.1474 115.109L83.8942 142.829C83.8942 142.829 88.0052 151.113 92.5006 153.63L107.643 165.075C107.791 165.075 107.968 165.104 108.116 165.104C111.991 165.221 115.806 163.494 118.674 160.538L130.534 148.478C131.214 147.659 131.599 146.488 131.658 145.112V96.4927Z" fill="url(#paint13_linear_18611_133549)"/>
+<path d="M127.606 98.0737C127.606 94.1514 124.294 89.1461 120.153 86.8337L73.4545 60.5482C69.314 58.2358 66.0016 59.4945 66.0016 63.4168V112.065C65.972 113.47 66.3565 115.08 67.0959 116.661L79.8427 144.381C79.8427 144.381 83.9536 152.664 88.449 155.182L104.922 164.46C109.388 166.978 113.351 163.612 113.351 163.612L126.483 150.03C127.163 149.21 127.547 148.039 127.606 146.664V98.0737Z" fill="url(#paint14_linear_18611_133549)"/>
+<path d="M74.402 80.13L119.179 105.332C120.509 106.093 121.604 107.879 121.604 109.343V141.248C121.604 142.712 120.509 143.268 119.179 142.507L74.402 117.304C73.0711 116.543 71.9768 114.758 71.9768 113.294V81.3887C71.9768 79.9544 73.0415 79.369 74.402 80.13Z" fill="url(#paint15_linear_18611_133549)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M102.499 109.138L99.7777 107.616L93.8331 104.279C93.4782 103.196 93.1825 101.761 93.4191 100.854C93.5965 100.21 94.0106 99.8588 94.75 99.8002C95.5485 99.7417 96.2879 100.034 96.9681 100.678C97.8258 101.498 98.5356 102.786 99.0088 103.781C99.1566 104.132 99.5115 104.337 99.8664 104.308L101.109 104.22C101.375 104.191 101.552 103.898 101.434 103.635C100.783 102.142 99.6003 99.8295 97.8258 98.161C96.4062 96.8438 94.8978 96.1999 93.4487 96.2877C92.0586 96.3755 91.1122 97.1658 90.7869 98.5708C90.4912 99.8002 90.6686 101.264 90.9644 102.581L89.6631 101.849C89.3673 101.703 89.042 101.937 89.042 102.288V114.289C89.042 114.641 89.1603 114.992 89.3969 115.226L96.3174 122.924C96.6723 123.305 97.116 123.51 97.6188 123.539L102.735 123.598C103.77 123.598 104.628 122.69 104.628 121.578V111.479C104.628 110.777 104.273 110.162 103.711 109.84L102.499 109.138ZM101.878 120.114L96.7906 120.056L91.7037 114.406V106.211L101.848 111.918V120.114H101.878Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M79.666 72.7829V71.817C79.666 70.3827 80.849 69.9143 82.3277 70.7632C83.7769 71.6121 84.9599 73.4561 84.9599 74.8904V75.8564C85.4627 76.2369 85.9655 76.6759 85.9655 76.8223V81.8862C85.9655 81.8862 85.9655 82.0326 85.8176 82.0033C85.3946 81.9405 84.1095 81.6382 83.217 81.4282C82.8614 81.3446 82.5681 81.2756 82.4165 81.2422C82.3277 81.2422 82.3277 81.2422 82.2982 81.213C82.2686 81.213 82.239 81.1837 82.1799 81.1252C81.6475 80.6275 79.3702 78.4908 78.7787 77.9346C78.6309 77.7882 78.6309 77.6419 78.6309 77.6419V72.5487C78.6309 72.4024 79.1632 72.578 79.666 72.7829ZM80.1688 77.6712C80.1983 77.7297 82.2094 79.6031 82.2094 79.6031L82.2982 79.6909C82.3277 79.6909 82.4165 79.7201 82.4165 79.7201C82.4165 79.7201 84.4276 80.1885 84.4571 80.1885C84.4877 80.2036 84.5024 80.2109 84.5096 80.2064C84.5163 80.2022 84.5163 80.1875 84.5163 80.1592V76.9979C84.5163 76.8223 83.5107 76.1491 82.2982 75.4466C81.1152 74.7441 80.1096 74.2465 80.1096 74.4221V77.5834C80.1096 77.598 80.117 77.6053 80.1281 77.6163C80.1392 77.6273 80.154 77.6419 80.1688 77.6712ZM82.3277 71.9926C81.4701 71.495 80.9377 71.6999 80.9377 72.5487H80.9673V73.3976C81.9433 73.8952 82.7418 74.3928 83.7178 75.0075V74.1586C83.7178 73.3098 83.1854 72.4902 82.3277 71.9926Z" fill="white"/>
+<path d="M88.0637 77.5542V78.7836L89.365 79.5447V83.0279L90.8142 83.8475V80.3935L92.0859 81.1253V79.8959L88.0637 77.5542Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M92.7086 80.248V84.9606L94.1578 85.8095V84.3166L94.6902 84.6093L95.3408 86.4827L96.997 87.4486L96.1394 85.2826C96.5238 85.3118 96.997 85.1655 96.997 84.3459C96.997 83.4678 96.4055 82.3847 95.2817 81.7408L92.7086 80.248ZM94.1578 82.3262L95.0451 82.8531C95.2817 82.9994 95.5183 83.2336 95.5183 83.497C95.5183 83.7605 95.2817 83.7312 95.0451 83.6141L94.1578 83.0872V82.3262Z" fill="white"/>
+<path d="M97.7349 83.1752V87.8878L101.373 89.9953V88.7659L99.184 87.478V86.9804L101.313 88.2098V86.9804L99.184 85.7217V85.2534L101.373 86.5413V85.2827L97.7349 83.1752Z" fill="white"/>
+<path d="M102.112 86.9801V85.7215L105.838 87.9168V89.0291L104.034 90.317L105.897 91.4V92.6587L102.112 90.4634V89.3218L103.945 88.0339L102.112 86.9801Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M106.252 90.5214C106.252 91.9557 107.406 93.6241 108.885 94.473C110.363 95.3219 111.517 94.9999 111.517 93.5656C111.517 92.1021 110.363 90.4629 108.885 89.5847C107.406 88.7359 106.252 89.0579 106.252 90.5214ZM107.731 91.3703C107.731 90.7263 108.175 90.4629 108.885 90.8727C109.594 91.2825 110.038 92.0728 110.038 92.7167C110.038 93.3607 109.594 93.6242 108.885 93.2144C108.175 92.8046 107.731 92.0142 107.731 91.3703Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 96.2584V91.5457L114.682 93.0386C115.806 93.6825 116.397 94.7656 116.397 95.6437C116.397 96.4633 115.924 96.6096 115.54 96.5804L116.397 98.7464L114.741 97.7805L114.09 95.9071L113.558 95.6144V97.1072L112.109 96.2584ZM114.445 94.1801L113.558 93.6533V94.4143L114.445 94.9412C114.682 95.0583 114.919 95.0875 114.919 94.8241C114.919 94.5607 114.682 94.3265 114.445 94.1801Z" fill="white"/>
+<defs>
+<linearGradient id="paint0_linear_18611_133549" x1="164.391" y1="305.631" x2="190.678" y2="302.033" gradientUnits="userSpaceOnUse">
+<stop stop-color="#244ABF"/>
+<stop offset="1" stop-color="#4760FF"/>
+</linearGradient>
+<linearGradient id="paint1_linear_18611_133549" x1="230.308" y1="193.077" x2="378.984" y2="14.8361" gradientUnits="userSpaceOnUse">
+<stop stop-color="#244ABF"/>
+<stop offset="1" stop-color="#4760FF"/>
+</linearGradient>
+<linearGradient id="paint2_linear_18611_133549" x1="170.207" y1="219.805" x2="197.304" y2="182.011" gradientUnits="userSpaceOnUse">
+<stop stop-color="#244ABF"/>
+<stop offset="1" stop-color="#4760FF"/>
+</linearGradient>
+<linearGradient id="paint3_linear_18611_133549" x1="160.706" y1="187.578" x2="149.002" y2="201.31" gradientUnits="userSpaceOnUse">
+<stop stop-color="#17D1AA"/>
+<stop offset="0.15" stop-color="#1ACBAF"/>
+<stop offset="0.37" stop-color="#21B8BC"/>
+<stop offset="0.62" stop-color="#2E9BD3"/>
+<stop offset="0.89" stop-color="#3F71F1"/>
+<stop offset="1" stop-color="#475FFF"/>
+</linearGradient>
+<linearGradient id="paint4_linear_18611_133549" x1="168.979" y1="74.7771" x2="108.541" y2="102.702" gradientUnits="userSpaceOnUse">
+<stop stop-color="#17D1AA"/>
+<stop offset="0.15" stop-color="#1ACBAF"/>
+<stop offset="0.37" stop-color="#21B8BC"/>
+<stop offset="0.62" stop-color="#2E9BD3"/>
+<stop offset="0.89" stop-color="#3F71F1"/>
+<stop offset="1" stop-color="#475FFF"/>
+</linearGradient>
+<linearGradient id="paint5_linear_18611_133549" x1="140" y1="207.623" x2="180.545" y2="207.623" gradientUnits="userSpaceOnUse">
+<stop stop-color="#17D1AA"/>
+<stop offset="0.15" stop-color="#1ACBAF"/>
+<stop offset="0.37" stop-color="#21B8BC"/>
+<stop offset="0.62" stop-color="#2E9BD3"/>
+<stop offset="0.89" stop-color="#3F71F1"/>
+<stop offset="1" stop-color="#475FFF"/>
+</linearGradient>
+<linearGradient id="paint6_linear_18611_133549" x1="172.48" y1="228.378" x2="249.684" y2="176.244" gradientUnits="userSpaceOnUse">
+<stop stop-color="#244ABF"/>
+<stop offset="1" stop-color="#4760FF"/>
+</linearGradient>
+<linearGradient id="paint7_linear_18611_133549" x1="144.518" y1="125.433" x2="219.458" y2="125.433" gradientUnits="userSpaceOnUse">
+<stop stop-color="#17D1AA"/>
+<stop offset="0.15" stop-color="#1ACBAF"/>
+<stop offset="0.37" stop-color="#21B8BC"/>
+<stop offset="0.62" stop-color="#2E9BD3"/>
+<stop offset="0.89" stop-color="#3F71F1"/>
+<stop offset="1" stop-color="#475FFF"/>
+</linearGradient>
+<linearGradient id="paint8_linear_18611_133549" x1="194.661" y1="51.2707" x2="227" y2="51.2707" gradientUnits="userSpaceOnUse">
+<stop stop-color="#17D1AA"/>
+<stop offset="0.15" stop-color="#1ACBAF"/>
+<stop offset="0.37" stop-color="#21B8BC"/>
+<stop offset="0.62" stop-color="#2E9BD3"/>
+<stop offset="0.89" stop-color="#3F71F1"/>
+<stop offset="1" stop-color="#475FFF"/>
+</linearGradient>
+<linearGradient id="paint9_linear_18611_133549" x1="202.92" y1="48.793" x2="157.458" y2="99.6057" gradientUnits="userSpaceOnUse">
+<stop stop-color="#17D1AA"/>
+<stop offset="0.15" stop-color="#1ACBAF"/>
+<stop offset="0.37" stop-color="#21B8BC"/>
+<stop offset="0.62" stop-color="#2E9BD3"/>
+<stop offset="0.89" stop-color="#3F71F1"/>
+<stop offset="1" stop-color="#475FFF"/>
+</linearGradient>
+<linearGradient id="paint10_linear_18611_133549" x1="101.224" y1="256.964" x2="124.904" y2="253.868" gradientUnits="userSpaceOnUse">
+<stop stop-color="#244ABF"/>
+<stop offset="1" stop-color="#4760FF"/>
+</linearGradient>
+<linearGradient id="paint11_linear_18611_133549" x1="104.019" y1="172.838" x2="119.64" y2="151.049" gradientUnits="userSpaceOnUse">
+<stop stop-color="#244ABF"/>
+<stop offset="1" stop-color="#4760FF"/>
+</linearGradient>
+<linearGradient id="paint12_linear_18611_133549" x1="98.5805" y1="154.274" x2="91.8276" y2="162.213" gradientUnits="userSpaceOnUse">
+<stop stop-color="#17D1AA"/>
+<stop offset="0.15" stop-color="#1ACBAF"/>
+<stop offset="0.37" stop-color="#21B8BC"/>
+<stop offset="0.62" stop-color="#2E9BD3"/>
+<stop offset="0.89" stop-color="#3F71F1"/>
+<stop offset="1" stop-color="#475FFF"/>
+</linearGradient>
+<linearGradient id="paint13_linear_18611_133549" x1="106.894" y1="59" x2="44.4503" y2="111.448" gradientUnits="userSpaceOnUse">
+<stop stop-color="#17D1AA"/>
+<stop offset="0.15" stop-color="#1ACBAF"/>
+<stop offset="0.37" stop-color="#21B8BC"/>
+<stop offset="0.62" stop-color="#2E9BD3"/>
+<stop offset="0.89" stop-color="#3F71F1"/>
+<stop offset="1" stop-color="#475FFF"/>
+</linearGradient>
+<linearGradient id="paint14_linear_18611_133549" x1="66.0001" y1="165.395" x2="127.606" y2="165.395" gradientUnits="userSpaceOnUse">
+<stop stop-color="#17D1AA"/>
+<stop offset="0.15" stop-color="#1ACBAF"/>
+<stop offset="0.37" stop-color="#21B8BC"/>
+<stop offset="0.62" stop-color="#2E9BD3"/>
+<stop offset="0.89" stop-color="#3F71F1"/>
+<stop offset="1" stop-color="#475FFF"/>
+</linearGradient>
+<linearGradient id="paint15_linear_18611_133549" x1="123.828" y1="181.026" x2="207.865" y2="66.8935" gradientUnits="userSpaceOnUse">
+<stop stop-color="#244ABF"/>
+<stop offset="1" stop-color="#4760FF"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/packages/yoroi-extension/ledger/assets/img/yoroi.svg b/packages/yoroi-extension/ledger/assets/img/yoroi.svg
new file mode 100644
index 0000000000..b2cf95b2f3
--- /dev/null
+++ b/packages/yoroi-extension/ledger/assets/img/yoroi.svg
@@ -0,0 +1,7 @@
+<svg width="56" height="48" viewBox="0 0 56 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M26.4594 19.4882L-0.000732422 0H8.31098L27.9303 14.0028L47.6476 0H56.0008L29.4085 19.4882C28.9654 19.8 28.4434 19.956 27.9303 19.956C27.4198 19.956 26.9004 19.8 26.4594 19.4882Z" fill="#4B6DDE"/>
+<path d="M36.8056 41.8013L4.43689 18.7441V12.1371L42.0263 38.7001L36.8056 41.8013Z" fill="#4B6DDE"/>
+<path d="M38.3724 28.3169L49.8581 19.8221V13.4847L33.9348 25.0808L38.3724 28.3169Z" fill="#4B6DDE"/>
+<path d="M48.5524 35.5984L49.8576 34.5197V28.3172L44.1147 32.3623L48.5524 35.5984Z" fill="#4B6DDE"/>
+<path d="M4.43689 33.0337L25.842 48.0007L31.1933 45.0342L4.43689 26.157V33.0337Z" fill="#4B6DDE"/>
+</svg>
diff --git a/packages/yoroi-extension/ledger/components/connect/operation/send/SignMessageBlock.js b/packages/yoroi-extension/ledger/components/connect/operation/send/SignMessageBlock.js
index 9b5b211a42..5dbe5db710 100644
--- a/packages/yoroi-extension/ledger/components/connect/operation/send/SignMessageBlock.js
+++ b/packages/yoroi-extension/ledger/components/connect/operation/send/SignMessageBlock.js
@@ -4,187 +4,24 @@ import type { Node } from 'react';
 import { observer } from 'mobx-react';
 import { intlShape, defineMessages } from 'react-intl';
 import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
-import semverGte from 'semver/functions/gte';
-
+import yoroiIcon from '../../../../assets/img/yoroi.svg';
+import hardwareWalletsIllustration from '../../../../assets/img/illustration-hardware-extension.svg';
+import styles from './SignMessageBlock.scss';
 import type { DeviceCodeType }  from '../../../../types/enum';
-import HintBlock from '../../../widgets/hint/HintBlock';
-import HintGap from '../../../widgets/hint/HintGap';
-import type { SignTransactionRequest, Certificate } from '@cardano-foundation/ledgerjs-hw-app-cardano';
-import {
-  AddressType,
-  CertificateType,
-  TxAuxiliaryDataType,
-  CredentialParamsType,
-} from '@cardano-foundation/ledgerjs-hw-app-cardano';
-import {
-  pathToString,
-} from '../../../../utils/cmn';
-import { bech32 } from 'bech32';
-import { getAddressHintBlock } from '../../../widgets/hint/AddressHintBlock';
-
-import styles from './SendTxHintBlock.scss';
 
-const message = defineMessages({
-  sStartNewTx: {
-    id: 'hint.sendTx.startNewTx',
-    defaultMessage: '!!!Check your Ledger screen, then press <strong>right</strong> button.'
-  },
-  sConfirmValue: {
-    id: 'hint.sendTx.confirmValue',
-    defaultMessage: '!!!Confirm the ADA amount by pressing <strong>both</strong> buttons.'
-  },
-  sConfirmAddress: {
-    id: 'hint.sendTx.confirmAddress',
-    defaultMessage: "!!!Confirm the receiver's address by pressing <strong>both</strong> buttons."
-  },
-  sConfirmFee: {
-    id: 'hint.sendTx.confirmFee',
-    defaultMessage: '!!!Confirm Transaction Fee by pressing <strong>both</strong> buttons.'
-  },
-  sConfirmTx: {
-    id: 'hint.sendTx.confirmTx',
-    defaultMessage: '!!!Confirm Transaction Fee by pressing <strong>both</strong> buttons.'
-  },
-  sTtl: {
-    id: 'hint.sendTx.ttl',
-    defaultMessage: '!!!Confirm the time-to-live by pressing <strong>both</strong> buttons.'
-  },
-  sRegistration: {
-    id: 'hint.certificate.registration',
-    defaultMessage: '!!!Confirm the staking key registration by pressing <strong>both</strong> buttons.'
-  },
-  sRegistrationComplete: {
-    id: 'hint.certificate.registrationComplete',
-    defaultMessage: '!!!Confirm the staking key registration by pressing the <strong>right</strong> button.'
-  },
-  sDeregistration: {
-    id: 'hint.certificate.deregistration',
-    defaultMessage: '!!!Confirm the deregistration by pressing <strong>both</strong> buttons.'
-  },
-  sDeregistrationComplete: {
-    id: 'hint.certificate.deregistrationComplete',
-    defaultMessage: '!!!Confirm the deregistration by pressing the <strong>right</strong> button.'
-  },
-  sDelegation: {
-    id: 'hint.certificate.delegation',
-    defaultMessage: '!!!Make sure the pool shown on your Ledger is the same as the one shown below, then press <strong>both</strong> buttons.'
-  },
-  sDelegationComplete: {
-    id: 'hint.certificate.delegationComplete',
-    defaultMessage: '!!!Confirm the delegation by pressing the <strong>right</strong> button.'
-  },
-  sPath: {
-    id: 'hint.verifyAddress.path',
-    defaultMessage: '!!!Make sure the address path shown on your Ledger is the same as the one shown below, then press <strong>both</strong> buttons.'
-  },
-  sWithdrawal: {
-    id: 'hint.withdrawal',
-    defaultMessage: '!!!Confirm the withdrawal, then press <strong>both</strong> buttons.'
-  },
-  sMetadata: {
-    id: 'hint.metadata',
-    defaultMessage: '!!!Confirm the metadata <strong>hash</strong>, then press <strong>both</strong> buttons.'
-  },
-  xStartNewTx: {
-    id: 'hint.nanoX.sendTx.startNewTx',
-    defaultMessage: '!!!Check your Ledger screen, then press <strong>both</strong> buttons.'
-  },
-  xConfirmValue: {
-    id: 'hint.sendTx.confirmValue',
-    defaultMessage: '!!!Confirm the ADA amount by pressing <strong>both</strong> buttons.'
-  },
-  xConfirmAddress: {
-    id: 'hint.nanoX.sendTx.confirmAddress',
-    defaultMessage: "!!!Confirm the receiver's address by pressing the <strong>right</strong> button to scroll through the entire address. Then press <strong>both</strong> buttons."
-  },
-  xConfirmFee: {
-    id: 'hint.sendTx.confirmFee',
-    defaultMessage: '!!!Confirm Transaction Fee by pressing <strong>both</strong> buttons.'
-  },
-  xConfirmTx: {
-    id: 'hint.nanoX.sendTx.confirmTx',
-    defaultMessage: '!!!Confirm the transaction by pressing the <strong>both</strong> buttons.'
-  },
-  xTtl: {
-    id: 'hint.sendTx.ttl',
-    defaultMessage: '!!!Confirm the time-to-live by pressing <strong>both</strong> buttons.'
-  },
-  xRegistration: {
-    id: 'hint.certificate.registration',
-    defaultMessage: '!!!Confirm the staking key registration by pressing <strong>both</strong> buttons.'
-  },
-  xRegistrationComplete: {
-    id: 'hint.certificate.registrationComplete',
-    defaultMessage: '!!!Confirm the staking key registration by pressing the <strong>right</strong> button.'
+const messages = defineMessages({
+  confirm: {
+    id: 'sign.data.confirm',
+    defaultMessage: '!!!Confirm on your hardware wallet'
   },
-  xDeregistration: {
-    id: 'hint.certificate.deregistration',
-    defaultMessage: '!!!Confirm the deregistration by pressing <strong>both</strong> buttons.'
-  },
-  xDeregistrationComplete: {
-    id: 'hint.certificate.deregistrationComplete',
-    defaultMessage: '!!!Confirm the deregistration by pressing the <strong>right</strong> button.'
-  },
-  xDelegation: {
-    id: 'hint.certificate.delegation',
-    defaultMessage: '!!!Make sure the pool shown on your Ledger is the same as the one shown below, then press <strong>both</strong> buttons.'
-  },
-  xDelegationComplete: {
-    id: 'hint.certificate.delegationComplete',
-    defaultMessage: '!!!Confirm the delegation by pressing the <strong>right</strong> button.'
-  },
-  xPath: {
-    id: 'hint.verifyAddress.path',
-    defaultMessage: '!!!Make sure the address path shown on your Ledger is the same as the one shown below, then press <strong>both</strong> buttons.'
-  },
-  xWithdrawal: {
-    id: 'hint.withdrawal',
-    defaultMessage: '!!!Confirm the withdrawal, then press <strong>both</strong> buttons.'
-  },
-  xMetadata: {
-    id: 'hint.metadata',
-    defaultMessage: '!!!Confirm the metadata <strong>hash</strong>, then press <strong>both</strong> buttons.'
-  },
-  catalystStep1: {
-    id: 'hint.catalystStep1',
-    defaultMessage: '!!!Confirm the network ID by pressing <strong>both</strong> buttons.',
-  },
-  catalystStep3: {
-    id: 'hint.catalystStep3',
-    defaultMessage: '!!!Confirm to register Catalyst voting key by pressing the <strong>right</strong> button.',
-  },
-  catalystStep4: {
-    id: 'hint.catalystStep4',
-    defaultMessage: '!!!Confirm the voting public key by pressing <strong>both</strong> buttons.',
-  },
-  catalystStep5: {
-    id: 'hint.catalystStep5',
-    defaultMessage: '!!!Confirm the staking key path by pressing <strong>both</strong> buttons.',
-  },
-  catalystStep6: {
-    id: 'hint.catalystStep6',
-    defaultMessage: '!!!Confirm the reward address by pressing <strong>both</strong> buttons.',
-  },
-  catalystStep7: {
-    id: 'hint.catalystStep7',
-    defaultMessage: '!!!Confirm the nonce by pressing <strong>both</strong> buttons.',
-  },
-  catalystStep8: {
-    id: 'hint.catalystStep8',
-    defaultMessage: '!!!Confirm voting key registration by pressing the <strong>right</strong> button.',
-  },
-  catalystStep9: {
-    id: 'hint.catalystStep9',
-    defaultMessage: '!!!Confirm the auxilliary data hash by pressing <strong>both</strong> buttons.',
-  },
-  confirmAssetFingerprint: {
-    id: 'hint.sendTx.confirmAssetFingerprint',
-    defaultMessage: '!!!Confirm the asset fingerprint by pressing <strong>both</strong> buttons',
-  },
-  confirmAssetAmount: {
-    id: 'hint.sendTx.confirmAssetAmount',
-    defaultMessage: '!!!Confirm the token amount by pressing <strong>both</strong> buttons',
+  instruction1: {
+    id: 'sign.data.instruction1',
+    defaultMessage: '!!!Take your hardware wallet device and follow the instructions there.'
   },
+  instruction2: {
+    id: 'sign.data.instruction2',
+    defaultMessage: '!!!Make sure you confirm a trusted action.'
+  }
 });
 
 type Props = {|
@@ -199,164 +36,25 @@ export default class SendTxHintBlock extends React.Component<Props> {
     intl: intlShape.isRequired
   };
 
-  renderCertificate: {|
-    cert: Certificate,
-    getAndIncrementStep: void => number,
-    deviceVersion: ?string,
-  |} => Array<Node> = (request) => {
-    const stakingKey = require(`../../../../assets/img/nano-${this.props.deviceCode}/hint-staking-key.png`);
-
-    if (request.cert.type === CertificateType.STAKE_REGISTRATION) {
-      const { params } = request.cert;
-      if (params.stakeCredential.type !== CredentialParamsType.KEY_PATH) {
-        throw new Error('unsupported stake credential type');
-      }
-      // $FLowIgnore
-      const { keyPath } = params.stakeCredential;
-      const imgRegister = require(`../../../../assets/img/nano-${this.props.deviceCode}/hint-registration.png`);
-      const imgRegisterConfirm = require(`../../../../assets/img/nano-${this.props.deviceCode}/hint-registration-confirm.png`);
-      const firstStep = request.getAndIncrementStep();
-      const secondStep = request.getAndIncrementStep();
-      const thirdStep = request.getAndIncrementStep();
-      return [
-        (<HintBlock
-          key={firstStep}
-          number={firstStep}
-          text={message[`${this.props.deviceCode}Registration`]}
-          imagePath={imgRegister}
-        />),
-        (<HintGap key={firstStep + 'gap'} />),
-        (<HintBlock
-          key={secondStep}
-          number={secondStep}
-          text={message[`${this.props.deviceCode}Path`]}
-          imagePath={stakingKey}
-          secondaryText={pathToString(keyPath)}
-        />),
-        (<HintGap key={secondStep + 'gap'} />),
-        (<HintBlock
-          key={thirdStep}
-          number={thirdStep}
-          text={message[`${this.props.deviceCode}RegistrationComplete`]}
-          imagePath={imgRegisterConfirm}
-        />),
-        (<HintGap key={thirdStep + 'gap'} />),
-      ];
-    }
-    if (request.cert.type === CertificateType.STAKE_DELEGATION) {
-      const { params } = request.cert;
-      if (params.stakeCredential.type !== CredentialParamsType.KEY_PATH) {
-        throw new Error('unsupported stake credential type');
-      }
-      // $FLowIgnore
-      const { keyPath } = params.stakeCredential;
-      const imgDelegatePool = require(`../../../../assets/img/nano-${this.props.deviceCode}/hint-delegation-pool.png`);
-      const imgDelegateConfirm = require(`../../../../assets/img/nano-${this.props.deviceCode}/hint-delegation-confirm.png`);
-      const firstStep = request.getAndIncrementStep();
-      const secondStep = request.getAndIncrementStep();
-      const thirdStep = request.getAndIncrementStep();
-
-      let poolId;
-      if (request.deviceVersion === undefined) {
-        throw new Error('unexpect null deviceVersion');
-      }
-      // Starting from version 2.4.1, the Ledger Cardano app show the pool ID
-      // in bech32, complying with CIP0005
-      if (semverGte(request.deviceVersion, '2.4.1')) {
-        poolId = bech32.encode(
-          'pool',
-          bech32.toWords(Buffer.from(params.poolKeyHashHex, 'hex'))
-        );
-      } else {
-        poolId = params.poolKeyHashHex;
-      }
-
-      return [
-        (<HintBlock
-          key={firstStep}
-          number={firstStep}
-          text={message[`${this.props.deviceCode}Delegation`]}
-          imagePath={imgDelegatePool}
-          secondaryText={poolId}
-        />),
-        (<HintGap key={firstStep + 'gap'} />),
-        (<HintBlock
-          key={secondStep}
-          number={secondStep}
-          text={message[`${this.props.deviceCode}Path`]}
-          imagePath={stakingKey}
-          secondaryText={pathToString(keyPath)}
-        />),
-        (<HintGap key={secondStep + 'gap'} />),
-        (<HintBlock
-          key={thirdStep}
-          number={thirdStep}
-          text={message[`${this.props.deviceCode}DelegationComplete`]}
-          imagePath={imgDelegateConfirm}
-        />),
-        (<HintGap key={thirdStep + 'gap'} />),
-      ];
-    }
-    if (request.cert.type === CertificateType.STAKE_DEREGISTRATION) {
-      const { params } = request.cert;
-      if (params.stakeCredential.type !== CredentialParamsType.KEY_PATH) {
-        throw new Error('unsupported stake credential type');
-      }
-      // $FLowIgnore
-      const { keyPath } = params.stakeCredential;
-      const imgDeregister = require(`../../../../assets/img/nano-${this.props.deviceCode}/hint-deregister-key.png`);
-      const imgDeregisterConfirm = require(`../../../../assets/img/nano-${this.props.deviceCode}/hint-deregister-confirm.png`);
-      const firstStep = request.getAndIncrementStep();
-      const secondStep = request.getAndIncrementStep();
-      const thirdStep = request.getAndIncrementStep();
-      return [
-        (<HintBlock
-          key={firstStep}
-          number={firstStep}
-          text={message[`${this.props.deviceCode}Deregistration`]}
-          imagePath={imgDeregister}
-        />),
-        (<HintGap key={firstStep + 'gap'} />),
-        (<HintBlock
-          key={secondStep}
-          number={secondStep}
-          text={message[`${this.props.deviceCode}Path`]}
-          imagePath={stakingKey}
-          secondaryText={pathToString(keyPath)}
-        />),
-        (<HintGap key={secondStep + 'gap'} />),
-        (<HintBlock
-          key={thirdStep}
-          number={thirdStep}
-          text={message[`${this.props.deviceCode}DeregistrationComplete`]}
-          imagePath={imgDeregisterConfirm}
-        />),
-        (<HintGap key={thirdStep + 'gap'} />),
-      ];
-    }
-    if (request.cert.type === CertificateType.STAKE_POOL_REGISTRATION) {
-      const { params } = request.cert;
-      // TODO
-    }
-    //  unhandled certificate type
-    return [];
-  }
-
   render(): Node {
-    const {
-      deviceCode,
-      wasDeviceLocked,
-      deviceVersion,
-    } = this.props;
-    const stepStartNumber: number = wasDeviceLocked ? 2 : 0; // 2 = count of common step
-    let stepNumber = stepStartNumber;
-    let content = 'Please confirm on your Ledger.';
-
+    const { intl } = this.context;
 
     return (
       <div className={styles.component}>
-        <div className={styles.stepsGrid}>
-          {content}
+        <div className={styles.title}>
+          <img src={yoroiIcon} />
+        </div>
+        <div className={styles.content}>
+          <img src={hardwareWalletsIllustration} />
+          <div className={styles.confirm}>
+            {intl.formatMessage(messages.confirm)}
+          </div>
+          <div className={styles.instruction}>
+            {intl.formatMessage(messages.instruction1)}
+          </div>
+          <div className={styles.instruction}>
+            {intl.formatMessage(messages.instruction2)}
+          </div>
         </div>
       </div>
     );
diff --git a/packages/yoroi-extension/ledger/components/connect/operation/send/SignMessageBlock.scss b/packages/yoroi-extension/ledger/components/connect/operation/send/SignMessageBlock.scss
new file mode 100644
index 0000000000..65e875e39c
--- /dev/null
+++ b/packages/yoroi-extension/ledger/components/connect/operation/send/SignMessageBlock.scss
@@ -0,0 +1,35 @@
+.component {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-grow: 1;
+  flex-direction: column;
+  .title {
+    margin: auto;
+  }
+  .content {
+    margin: auto;
+    flex-grow: 1;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+  }
+  .confirm {
+    //font-family: Rubik;
+    font-size: 18px;
+    font-weight: 600;
+    line-height: 26px;
+    text-align: center;
+    text-underline-position: from-font;
+    text-decoration-skip-ink: none;
+  }
+  .instruction {
+    //font-family: Rubik;
+    font-size: 16px;
+    font-weight: 400;
+    line-height: 24px;
+    text-align: center;
+    text-underline-position: from-font;
+    text-decoration-skip-ink: none;
+  }
+}
diff --git a/packages/yoroi-extension/ledger/i18n/locales/en-US.json b/packages/yoroi-extension/ledger/i18n/locales/en-US.json
index 26ccdcaf32..1a90de9bd6 100644
--- a/packages/yoroi-extension/ledger/i18n/locales/en-US.json
+++ b/packages/yoroi-extension/ledger/i18n/locales/en-US.json
@@ -62,5 +62,8 @@
   "hint.catalystStep6": "Confirm the reward address by pressing <strong>both</strong> buttons.",
   "hint.catalystStep7": "Confirm the nonce by pressing <strong>both</strong> buttons.",
   "hint.catalystStep8": "Confirm voting key registration by pressing the <strong>right</strong> button.",
-  "hint.catalystStep9": "Confirm the auxilliary data hash by pressing <strong>both</strong> buttons."
+  "hint.catalystStep9": "Confirm the auxilliary data hash by pressing <strong>both</strong> buttons.",
+  "sign.data.confirm": "Confirm on your hardware wallet",
+  "sign.data.instruction1": "Take your hardware wallet device and follow the instructions there.",
+  "sign.data.instruction2": "Make sure you confirm a trusted action."
 }
diff --git a/packages/yoroi-extension/package-lock.json b/packages/yoroi-extension/package-lock.json
index 3e5196a2bd..eecc7827e2 100644
--- a/packages/yoroi-extension/package-lock.json
+++ b/packages/yoroi-extension/package-lock.json
@@ -1,20 +1,21 @@
 {
   "name": "yoroi",
-  "version": "5.4.600",
+  "version": "5.4.601",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "yoroi",
-      "version": "5.4.600",
+      "version": "5.4.601",
       "license": "MIT",
       "dependencies": {
         "@amplitude/analytics-browser": "^2.1.3",
         "@babel/preset-typescript": "^7.24.7",
+        "@bringweb3/chrome-extension-kit": "^1.2.12",
         "@cardano-foundation/ledgerjs-hw-app-cardano": "7.1.3",
         "@emotion/react": "^11.4.1",
         "@emotion/styled": "^11.3.0",
-        "@emurgo/cardano-message-signing-browser": "1.0.1",
+        "@emurgo/cardano-message-signing-browser": "1.1.0",
         "@emurgo/cardano-serialization-lib-browser": "13.2.1",
         "@emurgo/cip14-js": "2.0.0",
         "@emurgo/cip4-js": "1.0.5",
@@ -79,6 +80,7 @@
         "react-blockies": "1.4.1",
         "react-copy-to-clipboard": "5.0.3",
         "react-dom": "17.0.2",
+        "react-helmet": "6.1.0",
         "react-intl": "2.9.0",
         "react-markdown": "5.0.3",
         "react-query": "^3.39.3",
@@ -113,7 +115,7 @@
         "@babel/register": "7.12.13",
         "@babel/runtime": "7.12.18",
         "@babel/runtime-corejs3": "7.12.18",
-        "@emurgo/cardano-message-signing-nodejs": "1.0.1",
+        "@emurgo/cardano-message-signing-nodejs": "1.1.0",
         "@emurgo/cardano-serialization-lib-nodejs": "13.2.1",
         "@emurgo/cross-csl-nodejs": "6.2.1",
         "@pmmmwh/react-refresh-webpack-plugin": "0.5.11",
@@ -2136,6 +2138,26 @@
       "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
       "dev": true
     },
+    "node_modules/@bringweb3/chrome-extension-kit": {
+      "version": "1.2.12",
+      "resolved": "https://registry.npmjs.org/@bringweb3/chrome-extension-kit/-/chrome-extension-kit-1.2.12.tgz",
+      "integrity": "sha512-ilt+oHWOfGavDuQ2sJjIBHzyQ2WJVUosoKlA+xxUb6BrAHMBKbH3FQhnxagwQtPRdetHt4Rm6qMaGW/+wpYD/g==",
+      "dependencies": {
+        "uuid": "^11.0.3"
+      }
+    },
+    "node_modules/@bringweb3/chrome-extension-kit/node_modules/uuid": {
+      "version": "11.0.5",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.0.5.tgz",
+      "integrity": "sha512-508e6IcKLrhxKdBbcA2b4KQZlLVp2+J5UwQ6F7Drckkc5N9ZJwFa4TgWtsww9UG8fGHbm6gbV19TdM5pQ4GaIA==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "bin": {
+        "uuid": "dist/esm/bin/uuid"
+      }
+    },
     "node_modules/@cardano-foundation/ledgerjs-hw-app-cardano": {
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/@cardano-foundation/ledgerjs-hw-app-cardano/-/ledgerjs-hw-app-cardano-7.1.3.tgz",
@@ -2428,14 +2450,14 @@
       "integrity": "sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww=="
     },
     "node_modules/@emurgo/cardano-message-signing-browser": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@emurgo/cardano-message-signing-browser/-/cardano-message-signing-browser-1.0.1.tgz",
-      "integrity": "sha512-yC4Ymq44WR0bXO1wzxCoyc2W/RD1KSAla0oYhin7IYoVkp2raGp8wt7QNF4pDdNnTcejn5fyPyYY9dL4666H1w=="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@emurgo/cardano-message-signing-browser/-/cardano-message-signing-browser-1.1.0.tgz",
+      "integrity": "sha512-LyeiGIqCyZu9DZnKsi4wlBjZA1MN+uy3Cqpb5J6RZWvFXDJnCoxrYB/EixUiGRD/la4WsldBgtPsrIHyGsVkpg=="
     },
     "node_modules/@emurgo/cardano-message-signing-nodejs": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@emurgo/cardano-message-signing-nodejs/-/cardano-message-signing-nodejs-1.0.1.tgz",
-      "integrity": "sha512-PoKh1tQnJX18f8iEr8Jk1KXxKCn9eqaSslMI1pyOJvYRJhQVDLCh0+9YReufjp0oFJIY1ShcrR+4/WnECVZUKQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@emurgo/cardano-message-signing-nodejs/-/cardano-message-signing-nodejs-1.1.0.tgz",
+      "integrity": "sha512-PQRc8K8wZshEdmQenNUzVtiI8oJNF/1uAnBhidee5C4o1l2mDLOW+ur46HWHIFKQ6x8mSJTllcjMscHgzju0gQ==",
       "dev": true
     },
     "node_modules/@emurgo/cardano-serialization-lib-browser": {
@@ -23687,6 +23709,25 @@
         "react": "17.0.2"
       }
     },
+    "node_modules/react-fast-compare": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz",
+      "integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ=="
+    },
+    "node_modules/react-helmet": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-6.1.0.tgz",
+      "integrity": "sha512-4uMzEY9nlDlgxr61NL3XbKRy1hEkXmKNXhjbAIOVw5vcFrsdYbH2FEwcNyWvWinl103nXgzYNlns9ca+8kFiWw==",
+      "dependencies": {
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.7.2",
+        "react-fast-compare": "^3.1.1",
+        "react-side-effect": "^2.1.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.3.0"
+      }
+    },
     "node_modules/react-intl": {
       "version": "2.9.0",
       "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-2.9.0.tgz",
@@ -23900,6 +23941,14 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
+    "node_modules/react-side-effect": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.2.tgz",
+      "integrity": "sha512-PVjOcvVOyIILrYoyGEpDN3vmYNLdy1CajSFNt4TDsVQC5KpTijDvWVoR+/7Rz2xT978D8/ZtFceXxzsPwZEDvw==",
+      "peerDependencies": {
+        "react": "^16.3.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
     "node_modules/react-smooth": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/react-smooth/-/react-smooth-4.0.1.tgz",
diff --git a/packages/yoroi-extension/package.json b/packages/yoroi-extension/package.json
index 8cdfc92407..0c9681114a 100644
--- a/packages/yoroi-extension/package.json
+++ b/packages/yoroi-extension/package.json
@@ -1,13 +1,14 @@
 {
   "name": "yoroi",
-  "version": "5.4.600",
+  "version": "5.4.601",
   "description": "Cardano ADA wallet",
   "scripts": {
     "dev-mv2": "rimraf dev/ && NODE_OPTIONS=--openssl-legacy-provider babel-node scripts-mv2/build --type=debug --env 'mainnet'",
     "dev:main": "NODE_OPTIONS=--openssl-legacy-provider babel-node scripts/dev main --env mainnet",
     "dev:background": "NODE_OPTIONS=--openssl-legacy-provider babel-node scripts/dev background  --env mainnet",
-    "dev:stable": "rimraf dev/ && concurrently -c auto  -n  extension,background \"npm run dev:main\"  \"npm run dev:background\"",
-    "dev:nightly": "rimraf dev/ && concurrently   -n  extension,background \"npm run dev:main --nightly\"  \"npm run dev:background --nightly\" ",
+    "dev:bring": "NODE_OPTIONS=--openssl-legacy-provider babel-node scripts/dev bring  --env mainnet",
+    "dev:stable": "rimraf dev/ && concurrently -c auto -n extension,background,bring \"npm run dev:main\"  \"npm run dev:background\" \"npm run dev:bring\"",
+    "dev:nightly": "rimraf dev/ && concurrently -c auto -n extension,background,bring \"npm run dev:main --nightly\"  \"npm run dev:background --nightly\" \"npm run dev:bring --nightly \"",
     "prod:build-mv2": "rimraf build/ && NODE_OPTIONS=--openssl-legacy-provider NODE_ENV=production babel-node scripts-mv2/build --type=prod",
     "prod:build": "rimraf build/ && NODE_OPTIONS=--openssl-legacy-provider NODE_ENV=production babel-node scripts/build",
     "prod:build:light": "rimraf build/ && NODE_OPTIONS=--openssl-legacy-provider NODE_ENV=production babel-node scripts/build --dontInjectConnector",
@@ -75,7 +76,7 @@
     "@babel/register": "7.12.13",
     "@babel/runtime": "7.12.18",
     "@babel/runtime-corejs3": "7.12.18",
-    "@emurgo/cardano-message-signing-nodejs": "1.0.1",
+    "@emurgo/cardano-message-signing-nodejs": "1.1.0",
     "@emurgo/cardano-serialization-lib-nodejs": "13.2.1",
     "@emurgo/cross-csl-nodejs": "6.2.1",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.11",
@@ -149,10 +150,11 @@
   "dependencies": {
     "@amplitude/analytics-browser": "^2.1.3",
     "@babel/preset-typescript": "^7.24.7",
+    "@bringweb3/chrome-extension-kit": "^1.2.12",
     "@cardano-foundation/ledgerjs-hw-app-cardano": "7.1.3",
     "@emotion/react": "^11.4.1",
     "@emotion/styled": "^11.3.0",
-    "@emurgo/cardano-message-signing-browser": "1.0.1",
+    "@emurgo/cardano-message-signing-browser": "1.1.0",
     "@emurgo/cardano-serialization-lib-browser": "13.2.1",
     "@emurgo/cip14-js": "2.0.0",
     "@emurgo/cip4-js": "1.0.5",
@@ -169,12 +171,12 @@
     "@svgr/webpack": "5.5.0",
     "@vespaiach/axios-fetch-adapter": "^0.3.1",
     "@yoroi/exchange": "2.0.1",
+    "@yoroi/explorers": "^1.0.2",
     "@yoroi/portfolio": "1.0.3",
     "@yoroi/resolver": "2.0.2",
     "@yoroi/staking": "^1.5.1",
     "@yoroi/swap": "1.5.2",
     "@yoroi/types": "1.5.8",
-    "@yoroi/explorers": "^1.0.2",
     "assert": "2.1.0",
     "async-await-queue": "2.1.4",
     "axios": "0.21.1",
@@ -217,6 +219,7 @@
     "react-blockies": "1.4.1",
     "react-copy-to-clipboard": "5.0.3",
     "react-dom": "17.0.2",
+    "react-helmet": "6.1.0",
     "react-intl": "2.9.0",
     "react-markdown": "5.0.3",
     "react-query": "^3.39.3",
diff --git a/packages/yoroi-extension/scripts-mv2/build.js b/packages/yoroi-extension/scripts-mv2/build.js
index bffd6a7928..03b3bdb85f 100644
--- a/packages/yoroi-extension/scripts-mv2/build.js
+++ b/packages/yoroi-extension/scripts-mv2/build.js
@@ -92,6 +92,16 @@ export function buildDev(env: string) {
     webpackHotMiddleware,
     serverOpts
   );
+
+  const Webpack = require('webpack');
+  const WebpackDevServer = require('webpack-dev-server');
+  const webpackConfig = config.contentScriptConfig(
+    argv.env,
+    isNightly,
+    !shouldInjectConnector
+  );
+  const server = new WebpackDevServer(webpackConfig.devServer, Webpack(webpackConfig));
+  server.start();
 }
 
 if (argv.type === 'debug') {
diff --git a/packages/yoroi-extension/scripts/dev.js b/packages/yoroi-extension/scripts/dev.js
index 213d8a674c..12117eb0ef 100644
--- a/packages/yoroi-extension/scripts/dev.js
+++ b/packages/yoroi-extension/scripts/dev.js
@@ -4,7 +4,11 @@ const webpack = require('webpack');
 const WebpackDevServer = require('webpack-dev-server');
 const tasks = require('./tasks');
 
-const { baseDevConfig, backgroundServiceWorkerConfig } = require(`../webpack/devConfig`);
+const {
+  baseDevConfig,
+  backgroundServiceWorkerConfig,
+  bringContentScriptConfig,
+} = require(`../webpack/devConfig`);
 const { argv, shouldInjectConnector, isNightly, buildAndCopyInjector } = require('./utils');
 
 // override NODE_ENV for ConfigWebpackPlugin
@@ -51,10 +55,25 @@ function devBackgroundServiceWorker() {
   server.start();
 }
 
+function devBringContentScript() {
+  const config = bringContentScriptConfig(
+    argv.env,
+    isNightly,
+    !shouldInjectConnector
+  );
+
+  const compiler = webpack(config);
+
+  const server = new WebpackDevServer(config.devServer, compiler);
+  server.start();
+}
+
 if (argv._[0] === 'main') {
   devMainWindow(argv.env);
 } else if (argv._[0] === 'background') {
   devBackgroundServiceWorker();
+} else if (argv._[0] === 'bring') {
+  devBringContentScript();
 } else {
   console.error('unknown component');
   process.exit(1);
diff --git a/packages/yoroi-extension/webpack-mv2/devConfig.js b/packages/yoroi-extension/webpack-mv2/devConfig.js
index 90a83e5e32..8078c99a1c 100644
--- a/packages/yoroi-extension/webpack-mv2/devConfig.js
+++ b/packages/yoroi-extension/webpack-mv2/devConfig.js
@@ -108,4 +108,58 @@ const baseDevConfig = (
   }
 });
 
-module.exports = { baseDevConfig };
+const contentScriptConfig = (
+  networkName /*: string */,
+  isNightly /*: boolean */,
+  isLight /* : ?boolean */ = false
+) /*: * */ => ({
+  mode: 'development',
+  resolve: commonConfig.resolve(),
+  devtool: 'source-map',
+  entry: {
+    contentScript: [
+      path.join(__dirname, '../chrome/content-scripts/bringInject.js'),
+    ]
+  },
+  devServer: {
+    devMiddleware: {
+      writeToDisk: true,
+    },
+    hot: false,
+    liveReload: false,
+    // HTTP is not actually used because injected code must always be written to `dev` dir
+    port: 3001,
+  },
+  output: {
+    path: path.join(__dirname, '../dev/js'),
+    filename: 'bringInject.js',
+  },
+
+  plugins: [
+    new webpack.optimize.LimitChunkCountPlugin({
+        maxChunks: 1
+    }),
+    new webpack.DefinePlugin(commonConfig.definePlugin(
+      networkName,
+      false,
+      isNightly,
+      Boolean(isLight),
+    )),
+    new webpack.IgnorePlugin(/[^/]+\/[\S]+.dev$/),
+  ],
+  module: {
+    rules: [
+      ...commonConfig.rules(false),
+      {
+        test: /\.js$/,
+        loader: 'babel-loader',
+        exclude: /node_modules/,
+        options: {
+          presets: []
+        }
+      },
+    ]
+  },
+});
+
+module.exports = { baseDevConfig, contentScriptConfig };
diff --git a/packages/yoroi-extension/webpack-mv2/prodConfig.js b/packages/yoroi-extension/webpack-mv2/prodConfig.js
index cdbc02d9e0..161757f942 100644
--- a/packages/yoroi-extension/webpack-mv2/prodConfig.js
+++ b/packages/yoroi-extension/webpack-mv2/prodConfig.js
@@ -17,6 +17,49 @@ type EnvParams = {|
   isLight: "true" | "false"
 |};
 */
+const contentScriptConfig = (env /*: EnvParams */) /*: * */ => ({
+  mode: 'production',
+  optimization: commonConfig.optimization,
+  experiments: commonConfig.experiments,
+  resolve: commonConfig.resolve(),
+  entry: {
+    contentScript: [
+      path.join(__dirname, '../chrome/content-scripts/bringInject.js'),
+    ]
+  },
+  output: {
+    path: path.join(__dirname, '../build/js'),
+    filename: 'bringInject.js',
+  },
+
+  plugins: [
+    ...commonConfig.plugins('build', env.networkName),
+    new webpack.optimize.LimitChunkCountPlugin({
+        maxChunks: 1
+    }),
+    new webpack.DefinePlugin(commonConfig.definePlugin(
+      env.networkName,
+      true,
+      JSON.parse(env.nightly),
+      JSON.parse(env.isLight)
+    )),
+    new webpack.IgnorePlugin(/[^/]+\/[\S]+.dev$/),
+  ],
+  module: {
+    rules: [
+      ...commonConfig.rules(false),
+      {
+        test: /\.js$/,
+        loader: 'babel-loader',
+        exclude: /node_modules/,
+        options: {
+          presets: []
+        }
+      },
+    ]
+  },
+});
+
 const baseProdConfig = (env /*: EnvParams */) /*: * */ => ({
   mode: 'production',
   optimization: commonConfig.optimization,
@@ -86,4 +129,4 @@ const baseProdConfig = (env /*: EnvParams */) /*: * */ => ({
 });
 
 // export a callable function so we can swap out the network to use
-module.exports = baseProdConfig;
+module.exports = [ contentScriptConfig, baseProdConfig ];
diff --git a/packages/yoroi-extension/webpack/devConfig.js b/packages/yoroi-extension/webpack/devConfig.js
index 76450f93ce..e21453783c 100644
--- a/packages/yoroi-extension/webpack/devConfig.js
+++ b/packages/yoroi-extension/webpack/devConfig.js
@@ -170,4 +170,58 @@ const backgroundServiceWorkerConfig = (
   }
 });
 
-module.exports = { baseDevConfig, backgroundServiceWorkerConfig };
+const bringContentScriptConfig = (
+  networkName /*: string */,
+  isNightly /*: boolean */,
+  isLight /* : ?boolean */ = false
+) /*: * */ => ({
+  mode: 'development',
+  resolve: commonConfig.resolve(),
+  devtool: 'source-map',
+  entry: {
+    contentScript: [
+      path.join(__dirname, '../chrome/content-scripts/bringInject.js'),
+    ]
+  },
+  devServer: {
+    devMiddleware: {
+      writeToDisk: true,
+    },
+    hot: false,
+    liveReload: false,
+    // HTTP is not actually used because injected code must always be written to `dev` dir
+    port: 8082,
+  },
+  output: {
+    path: path.join(__dirname, '../dev/js'),
+    filename: 'bringInject.js',
+  },
+
+  plugins: [
+    new webpack.optimize.LimitChunkCountPlugin({
+        maxChunks: 1
+    }),
+    new webpack.DefinePlugin(commonConfig.definePlugin(
+      networkName,
+      false,
+      isNightly,
+      Boolean(isLight),
+    )),
+    new webpack.IgnorePlugin(/[^/]+\/[\S]+.dev$/),
+  ],
+  module: {
+    rules: [
+      ...commonConfig.rules(false),
+      {
+        test: /\.js$/,
+        loader: 'babel-loader',
+        exclude: /node_modules/,
+        options: {
+          presets: []
+        }
+      },
+    ]
+  },
+});
+
+module.exports = { baseDevConfig, backgroundServiceWorkerConfig, bringContentScriptConfig };
diff --git a/packages/yoroi-extension/webpack/prodConfig.js b/packages/yoroi-extension/webpack/prodConfig.js
index 336efbb255..947692b9f5 100644
--- a/packages/yoroi-extension/webpack/prodConfig.js
+++ b/packages/yoroi-extension/webpack/prodConfig.js
@@ -143,5 +143,48 @@ const backgroundServiceWorkerConfig = (env /*: EnvParams */) /*: * */ => ({
   }
 });
 
+const bringContentScriptConfig = (env /*: EnvParams */) /*: * */ => ({
+  mode: 'production',
+  optimization: commonConfig.optimization,
+  experiments: commonConfig.experiments,
+  resolve: commonConfig.resolve(),
+  entry: {
+    contentScript: [
+      path.join(__dirname, '../chrome/content-scripts/bringInject.js'),
+    ]
+  },
+  output: {
+    path: path.join(__dirname, '../build/js'),
+    filename: 'bringInject.js',
+  },
+
+  plugins: [
+    ...commonConfig.plugins('build', env.networkName),
+    new webpack.optimize.LimitChunkCountPlugin({
+        maxChunks: 1
+    }),
+    new webpack.DefinePlugin(commonConfig.definePlugin(
+      env.networkName,
+      true,
+      JSON.parse(env.nightly),
+      JSON.parse(env.isLight)
+    )),
+    new webpack.IgnorePlugin(/[^/]+\/[\S]+.dev$/),
+  ],
+  module: {
+    rules: [
+      ...commonConfig.rules(false),
+      {
+        test: /\.js$/,
+        loader: 'babel-loader',
+        exclude: /node_modules/,
+        options: {
+          presets: []
+        }
+      },
+    ]
+  },
+});
+
 // export a callable function so we can swap out the network to use
-module.exports = [baseProdConfig, backgroundServiceWorkerConfig];
+module.exports = [baseProdConfig, backgroundServiceWorkerConfig, bringContentScriptConfig];