Skip to content

Commit

Permalink
uri feature (melded commits)
Browse files Browse the repository at this point in the history
  • Loading branch information
v-almonacid committed Jun 25, 2019
1 parent ab4c0cf commit 3ef09fc
Show file tree
Hide file tree
Showing 41 changed files with 1,551 additions and 68 deletions.
6 changes: 6 additions & 0 deletions app/Routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ const WalletSendPage = resolver('containers/wallet/WalletSendPage');
const WalletReceivePage = resolver('containers/wallet/WalletReceivePage');
const DaedalusTransferPage = resolver('containers/transfer/DaedalusTransferPage');
const AdaRedemptionPage = resolver('containers/wallet/AdaRedemptionPage');
const URILandingPage = resolver('containers/uri/URILandingPage');

/* eslint-disable max-len */
export const Routes = (
Expand Down Expand Up @@ -83,6 +84,11 @@ export const Routes = (
path={ROUTES.DAEDALUS_TRANFER.ROOT}
component={(props) => <DaedalusTransferPage {...props} stores={stores} actions={actions} />}
/>
<Route
exact
path={ROUTES.SEND_FROM_URI.ROOT}
component={(props) => <URILandingPage {...props} stores={stores} actions={actions} />}
/>
<Redirect to={ROUTES.WALLETS.ADD} />
</Switch>
</div>
Expand Down
12 changes: 12 additions & 0 deletions app/assets/images/generate-uri.inline.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions app/assets/images/uri/invalid-uri.inline.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
64 changes: 64 additions & 0 deletions app/assets/images/uri/perform-tx-uri.inline.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 3ef09fc

Please sign in to comment.