fix(dw): add share btn next to preflight and describe it

kadena-community · Jan 21, 2025 · 2fe53b2 · 2fe53b2
1 parent c51d35c
commit 2fe53b2
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 18 deletions.
diff --git a/packages/apps/dev-wallet/src/pages/transaction/components/TxPipeLine.tsx b/packages/apps/dev-wallet/src/pages/transaction/components/TxPipeLine.tsx
@@ -221,15 +221,29 @@ function TxStatusList({
               {sendDisabled ? 'Transaction is pending' : 'Ready to preflight'}
             </Stack>
           </Text>
+          <Text size="small">
+            Preflight will test your transaction first to avoid paying gas for a
+            failed submission.
+          </Text>
           {variant === 'expanded' && (
-            <Button
-              isCompact
-              onClick={() => onPreflight()}
-              isDisabled={sendDisabled}
-              startVisual={<MonoViewInAr />}
-            >
-              Preflight transaction
-            </Button>
+            <Stack gap={'sm'}>
+              <Button
+                isCompact
+                onClick={() => onPreflight()}
+                isDisabled={sendDisabled}
+                startVisual={<MonoViewInAr />}
+              >
+                Preflight
+              </Button>
+              <Button
+                variant="outlined"
+                startVisual={<MonoShare />}
+                isCompact
+                onClick={copyTx}
+              >
+                {copied ? 'copied' : 'Share'}
+              </Button>
+            </Stack>
           )}
         </Stack>
       ),
@@ -282,14 +296,24 @@ function TxStatusList({
             </Stack>
           </Text>
           {variant === 'expanded' && (
-            <Button
-              isCompact
-              onClick={() => onSubmit()}
-              isDisabled={sendDisabled}
-              startVisual={<MonoViewInAr />}
-            >
-              Send transaction
-            </Button>
+            <Stack gap={'sm'}>
+              <Button
+                isCompact
+                onClick={() => onSubmit()}
+                isDisabled={sendDisabled}
+                startVisual={<MonoViewInAr />}
+              >
+                Send tx
+              </Button>
+              <Button
+                variant="outlined"
+                startVisual={<MonoShare />}
+                isCompact
+                onClick={copyTx}
+              >
+                {copied ? 'copied' : 'Share'}
+              </Button>
+            </Stack>
           )}
         </Stack>
       ),

diff --git a/packages/apps/dev-wallet/src/pages/transaction/components/TxTile.tsx b/packages/apps/dev-wallet/src/pages/transaction/components/TxTile.tsx
@@ -171,7 +171,9 @@ export const TxTile = ({
               paddingBlockEnd={'sm'}
             >
               <Text size="small">
-                The transaction is Signed; you can now call preflight
+                {sendDisabled
+                  ? 'Waiting for redistribution to complete'
+                  : 'The transaction is Signed; you can now call preflight'}
               </Text>
             </Stack>
           </>

diff --git a/packages/apps/dev-wallet/src/pages/transfer/Steps/TransferForm.tsx b/packages/apps/dev-wallet/src/pages/transfer/Steps/TransferForm.tsx
@@ -406,10 +406,26 @@ export function TransferForm({
     onSubmit(
       {
         ...data,
+        receivers: [
+          ...data.receivers,
+          ...xchainSameAccount.map((x) => ({
+            amount: x.amount,
+            address: senderAccount.address,
+            chain: x.target,
+            xchain: true,
+            chunks: [
+              {
+                amount: x.amount,
+                chainId: x.source,
+              },
+            ],
+            discoveredAccount: senderAccount,
+          })),
+        ],
         gasPayer: data.gasPayer || data.senderAccount,
         creationTime: data.creationTime ?? Math.floor(Date.now() / 1000),
       },
-      [...xchainSameAccount, ...redistribution],
+      [...redistribution],
     );
   }