fix uri handling

Emurgo · Jan 9, 2025 · eaf82ad · eaf82ad
1 parent 8fe0f0e
commit eaf82ad
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 21 deletions.
diff --git a/packages/yoroi-extension/app/Routes.js b/packages/yoroi-extension/app/Routes.js
@@ -288,6 +288,8 @@ export const Routes = (stores: StoresMap): Node => {
             component={props => wrapPortfolio({ ...props, stores }, PortfolioSubpages(stores))}
           />
         </Switch>
+
+        <Redirect to={ROUTES.ROOT} />
       </Suspense>
     </QueryClientProvider>
   );

diff --git 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
@@ -18,10 +18,6 @@ export default class URILandingPage extends Component<StoresProps> {
   };
 
   onConfirm: void => void = () => {
-    const firstSelectedWalletId = this.firstSelectedWalletId();
-    if (firstSelectedWalletId) {
-      this.props.stores.wallets.setActiveWallet({ publicDeriverId: firstSelectedWalletId });
-    }
     // this will automatically reroute to the right page if no wallet exists
     this.props.stores.app.goToRoute({ route: ROUTES.WALLETS.SEND });
   };

diff --git a/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js b/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js
@@ -101,21 +101,22 @@ export default class ProfileStore extends BaseProfileStore<StoresMap> {
         await stores.memos.loadFromStorage();
         await stores.tokenInfoStore.refreshTokenInfo();
         await stores.coinPriceStore.loadFromStorage();
-
         await wallets.restoreWalletsFromStorage();
+
+        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.wallets.setActiveWallet({
+          publicDeriverId: lastSelectedWallet?.publicDeriverId ?? firstWallet.publicDeriverId,
+        });
+
         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.wallets.setActiveWallet({
-            publicDeriverId: lastSelectedWallet?.publicDeriverId ?? firstWallet.publicDeriverId,
-          });
           stores.app.goToRoute({ route: ROUTES.WALLETS.ROOT });
         }
         runInAction(() => {

diff --git 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);