Skip to content

Commit 4daaa0c

Browse files
authored
Movement fe integration appv2 (#4047)
2 parents 0777ecc + 7647927 commit 4daaa0c

File tree

18 files changed

+716
-45
lines changed

18 files changed

+716
-45
lines changed

app2/app2.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ _: {
2020
{
2121
packages = {
2222
app2 = jsPkgs.buildNpmPackage {
23-
npmDepsHash = "sha256-LlSGZhPStl8xGhbHfQ6uXskvnK6yjL9VTY7/iUK1/Hg=";
23+
npmDepsHash = "sha256-Jc9GX9R+5n5Ce+xPPUH1MfY7/3o2hwn/aP3V6yi9acY=";
2424
src = ./.;
2525
sourceRoot = "app2";
2626
npmFlags = [ "--legacy-peer-deps" ];

app2/package-lock.json

Lines changed: 66 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app2/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"test": "npm run test:unit -- --run"
1717
},
1818
"devDependencies": {
19+
"@aptos-labs/ts-sdk": "1.34.0",
1920
"@cosmjs/amino": "^0.33.0",
2021
"@cosmjs/cosmwasm-stargate": "0.33.0",
2122
"@cosmjs/proto-signing": "^0.33.0",

app2/src/lib/components/Transfer/index.svelte

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ import {
1515
hasFailedExit as hasEvmFailedExit,
1616
isComplete as isEvmComplete
1717
} from "$lib/services/transfer-ucs03-evm"
18+
import {
19+
hasFailedExit as hasAptosFailedExit,
20+
isComplete as isAptosComplete
21+
} from "$lib/services/transfer-ucs03-aptos"
1822
1923
$effect(() => {
2024
transfer.getQuoteToken()
@@ -40,6 +44,14 @@ function getStatus(
4044
if (isCosmosComplete(state.state)) return "complete"
4145
return "processing"
4246
}
47+
case "Aptos": {
48+
if (state.state._tag === "Filling") return "filling"
49+
if (hasAptosFailedExit(state.state)) return "failed"
50+
if (isAptosComplete(state.state)) return "complete"
51+
return "processing"
52+
}
53+
default:
54+
return "empty"
4355
}
4456
}
4557
@@ -48,6 +60,7 @@ function getError(state: TransferStateUnion): string | null {
4860
case "Empty":
4961
return null
5062
case "EVM":
63+
case "Aptos":
5164
case "Cosmos": {
5265
const innerState = state.state
5366
if (innerState._tag === "Filling") return null
@@ -63,6 +76,8 @@ function getError(state: TransferStateUnion): string | null {
6376
}
6477
return null
6578
}
79+
default:
80+
return null
6681
}
6782
}
6883
@@ -72,8 +87,13 @@ function getStepName(state: TransferStateUnion): string | null {
7287
case "Empty":
7388
return null
7489
case "EVM":
90+
return state.state._tag
91+
case "Aptos":
92+
return state.state._tag
7593
case "Cosmos":
7694
return state.state._tag
95+
default:
96+
return null
7797
}
7898
}
7999

0 commit comments

Comments
 (0)