refactor: wallet receive flow redesign (#70)

AmbossTech · Sep 17, 2024 · 2ff0886 · 2ff0886
1 parent 095c3e1
commit 2ff0886
Show file tree

Hide file tree

Showing 14 changed files with 717 additions and 112 deletions.
diff --git a/messages/en.json b/messages/en.json
@@ -1,5 +1,6 @@
 {
   "App": {
+    "copy": "Copy",
     "Dashboard": {
       "asset": "An asset in your wallet.",
       "buy": "Buy",
@@ -14,8 +15,12 @@
       "what-asset": "What is {asset}?"
     },
     "miban": "MIBAN Code",
+    "save": "Save",
     "view-all": "View all",
     "Wallet": {
+      "amount": "Please specify an amount.",
+      "amount-custom": "Customize Amount",
+      "amount-ln": "Please specify an amount to generate a Lightning invoice.",
       "assets": "Assets",
       "receive": "Receive",
       "send": "Send"

diff --git a/messages/es.json b/messages/es.json
@@ -1,5 +1,6 @@
 {
   "App": {
+    "copy": "Copiar",
     "Dashboard": {
       "asset": "Un activo en tu billetera.",
       "buy": "Comprar",
@@ -14,8 +15,12 @@
       "what-asset": "Qué es {asset}?"
     },
     "miban": "Código MIBAN",
+    "save": "Guardar",
     "view-all": "Ver todos",
     "Wallet": {
+      "amount": "Especifíca una cantidad.",
+      "amount-custom": "Cambia la cantidad",
+      "amount-ln": "Por favor especifíca una cantidad para generar un recibo de Lightning.",
       "assets": "Activos",
       "receive": "Recibir",
       "send": "Envíar"

diff --git a/src/app/(app)/(layout)/wallet/[walletId]/account/[accountId]/receive/page.tsx b/src/app/(app)/(layout)/wallet/[walletId]/account/[accountId]/receive/page.tsx
diff --git a/src/app/(app)/(layout)/wallet/receive/page.tsx b/src/app/(app)/(layout)/wallet/receive/page.tsx
@@ -0,0 +1,7 @@
+'use client';
+
+import { Receive } from '@/views/wallet/Receive';
+
+export default function Page() {
+  return <Receive />;
+}
diff --git a/src/graphql/mutations/__generated__/createInvoice.generated.tsx b/src/graphql/mutations/__generated__/createInvoice.generated.tsx
diff --git a/src/graphql/mutations/createInvoice.ts b/src/graphql/mutations/createInvoice.ts
@@ -0,0 +1,11 @@
+import { gql } from '@apollo/client';
+
+export const CreateLightningInvoice = gql`
+  mutation CreateLightningInvoice($input: CreateLightingInvoiceInput!) {
+    wallets {
+      create_lightning_invoice(input: $input) {
+        payment_request
+      }
+    }
+  }
+`;
diff --git a/src/graphql/queries/__generated__/prices.generated.tsx b/src/graphql/queries/__generated__/prices.generated.tsx
diff --git a/src/graphql/queries/prices.ts b/src/graphql/queries/prices.ts
@@ -17,3 +17,17 @@ export const getPricesHistorical = gql`
     }
   }
 `;
+
+export const getPriceCurrent = gql`
+  query getPriceCurrent {
+    prices {
+      current {
+        currency
+        date
+        id
+        value
+      }
+      id
+    }
+  }
+`;
diff --git a/src/graphql/types.ts b/src/graphql/types.ts
@@ -91,6 +91,16 @@ export type CreateContactInput = {
   wallet_id: Scalars['String']['input'];
 };
 
+export type CreateLightingInvoice = {
+  __typename?: 'CreateLightingInvoice';
+  payment_request: Scalars['String']['output'];
+};
+
+export type CreateLightingInvoiceInput = {
+  amount: Scalars['Float']['input'];
+  wallet_account_id: Scalars['String']['input'];
+};
+
 export type CreateLiquidTransaction = {
   __typename?: 'CreateLiquidTransaction';
   base_64: Scalars['String']['output'];
@@ -457,6 +467,7 @@ export type PricePoint = {
 
 export type PriceQueries = {
   __typename?: 'PriceQueries';
+  current: PricePoint;
   historical: PriceHistorical;
   id: Scalars['String']['output'];
 };
@@ -810,6 +821,7 @@ export type WalletMutations = {
   broadcast_liquid_transaction: BroadcastLiquidTransaction;
   change_name: Scalars['Boolean']['output'];
   create: CreateWallet;
+  create_lightning_invoice: CreateLightingInvoice;
   create_onchain_address: CreateOnchainAddress;
   create_onchain_address_swap: ReceiveSwap;
   refresh_wallet: Scalars['Boolean']['output'];
@@ -828,6 +840,10 @@ export type WalletMutationsCreateArgs = {
   input: CreateWalletInput;
 };
 
+export type WalletMutationsCreate_Lightning_InvoiceArgs = {
+  input: CreateLightingInvoiceInput;
+};
+
 export type WalletMutationsCreate_Onchain_AddressArgs = {
   input: CreateOnchainAddressInput;
 };

diff --git a/src/utils/routes.ts b/src/utils/routes.ts
@@ -16,8 +16,7 @@ export const ROUTES = {
   wallet: {
     home: '/wallet',
     settings: (id: string) => `/wallet/${id}/settings`,
-    receive: (walletId: string, accountId: string) =>
-      `/wallet/${walletId}/account/${accountId}/receive`,
+    receive: '/wallet/receive',
     send: {
       home: (walletId: string, accountId: string, assetId?: string) =>
         `/wallet/${walletId}/account/${accountId}/send${assetId ? `?assetId=${assetId}` : ''}`,

diff --git a/src/views/dashboard/BancoCode.tsx b/src/views/dashboard/BancoCode.tsx
@@ -88,7 +88,7 @@ export const BancoCode: FC<{ id: string }> = ({ id }) => {
 
               <div className="round-canvas mx-auto w-fit">
                 <Canvas
-                  text={'lightning:' + address}
+                  text={address}
                   options={{
                     margin: 3,
                     width: 250,