Skip to content

Commit 0b7a33d

Browse files
eldenparkeldenpark
committed
Merge branch 'main' into chihun/social-login-qa
2 parents b732cdc + 59b32f3 commit 0b7a33d

135 files changed

Lines changed: 12031 additions & 2507 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/user_dashboard/global.d.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,15 @@ declare global {
77
NEXT_PUBLIC_OKO_DEMO_ENDPOINT: string;
88
NEXT_PUBLIC_OKO_FEATURE_REQUEST_ENDPOINT: string;
99
NEXT_PUBLIC_OKO_GET_SUPPORT_ENDPOINT: string;
10+
NEXT_PUBLIC_KEPLR_API_ENDPOINT: string;
11+
NEXT_PUBLIC_TX_CODEC_BASE_URL: string;
12+
NEXT_PUBLIC_TOPUP_BASE_URL: string;
13+
NEXT_PUBLIC_TX_HISTORY_BASE_URL: string;
14+
NEXT_PUBLIC_COINGECKO_ENDPOINT: string;
15+
NEXT_PUBLIC_COINGECKO_GETPRICE: string;
16+
NEXT_PUBLIC_COINGECKO_COIN_DATA_BY_TOKEN_ADDRESS: string;
17+
NEXT_PUBLIC_SKIP_TOKEN_INFO_API_URI: string;
18+
NEXT_PUBLIC_ETHEREUM_ENDPOINT: string;
1019
}
1120
}
1221
}

‎apps/user_dashboard/next-env.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/// <reference types="next" />
22
/// <reference types="next/image-types/global" />
3-
/// <reference path="./.next/types/routes.d.ts" />
3+
import "./.next/dev/types/routes.d.ts";
44

55
// NOTE: This file should not be edited
66
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

‎apps/user_dashboard/package.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,38 @@
1313
"dependencies": {
1414
"@floating-ui/dom": "^1.7.4",
1515
"@floating-ui/react": "^0.27.16",
16+
"@keplr-wallet/background": "0.12.297",
17+
"@keplr-wallet/common": "0.12.297",
18+
"@keplr-wallet/cosmos": "0.12.297",
19+
"@keplr-wallet/router": "0.12.297",
20+
"@keplr-wallet/router-extension": "^0.12.297",
21+
"@keplr-wallet/stores": "0.12.297",
22+
"@keplr-wallet/stores-core": "0.12.297",
23+
"@keplr-wallet/stores-etc": "^0.12.297",
24+
"@keplr-wallet/stores-eth": "^0.12.297",
25+
"@keplr-wallet/types": "0.12.297",
26+
"@keplr-wallet/unit": "0.12.297",
1627
"@oko-wallet/dotenv": "^0.0.2-alpha.27",
1728
"@oko-wallet/oko-common-ui": "workspace:*",
1829
"@oko-wallet/oko-sdk-cosmos": "^0.0.6-rc.151",
1930
"@oko-wallet/oko-sdk-eth": "0.0.6-rc.133",
2031
"@oko-wallet/stdlib-js": "^0.0.2-rc.42",
2132
"@tanstack/react-query": "^5.90.12",
2233
"@tanstack/react-table": "^8.21.3",
34+
"lodash.throttle": "^4.1.1",
35+
"mobx": "^6.10.0",
36+
"mobx-react-lite": "^4.0.0",
37+
"mobx-utils": "^6.0.0",
2338
"next": "^16.0.7",
39+
"qrcode.react": "^4.2.0",
2440
"react": "^19.2.1",
2541
"react-dom": "^19.2.1",
2642
"react-hook-form": "^7.65.0",
43+
"utility-types": "^3.11.0",
2744
"zustand": "^5.0.6"
2845
},
2946
"devDependencies": {
47+
"@types/lodash.throttle": "^4",
3048
"@types/node": "^24.10.1",
3149
"@types/react": "^19.2.7",
3250
"@types/react-dom": "^19.2.3",

‎apps/user_dashboard/src/app/edit-info/page.module.scss‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎apps/user_dashboard/src/app/edit-info/page.tsx‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎apps/user_dashboard/src/app/layout.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import type { ReactNode } from "react";
12
import type { Metadata } from "next";
23
import { Geist, Geist_Mono, Inter } from "next/font/google";
34

@@ -46,7 +47,7 @@ export const metadata: Metadata = {
4647
export default function RootLayout({
4748
children,
4849
}: Readonly<{
49-
children: React.ReactNode;
50+
children: ReactNode;
5051
}>) {
5152
return (
5253
<html lang="en">

‎apps/user_dashboard/src/app/page.tsx‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
import React from "react";
2-
31
import styles from "./page.module.scss";
42
import { Authorized } from "@oko-wallet-user-dashboard/components/authorized/authorized";
53
import { DashboardBody } from "@oko-wallet-user-dashboard/components/dashboard_body/dashboard_body";
64
import { LeftBar } from "@oko-wallet-user-dashboard/components/left_bar/left_bar";
75
import { DashboardHeader } from "@oko-wallet-user-dashboard/components/dashboard_header/dashboard_header";
86
import { ConnectedApps } from "@oko-wallet-user-dashboard/components/connected_apps/connected_apps";
97
import { TotalBalance } from "@oko-wallet-user-dashboard/components/total_balance/total_balance";
10-
import { AssetList } from "@oko-wallet-user-dashboard/components/asset_list/asslet_list";
8+
import { MyAssets } from "@oko-wallet-user-dashboard/components/my_assets/my_assets";
119

1210
export default function Home() {
1311
return (
@@ -20,7 +18,7 @@ export default function Home() {
2018
<div className={styles.content}>
2119
<ConnectedApps />
2220
<TotalBalance />
23-
<AssetList />
21+
<MyAssets />
2422
</div>
2523
</DashboardBody>
2624
</div>

‎apps/user_dashboard/src/app/users/sign_in/page.module.scss‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,3 @@
2929
align-items: center;
3030
justify-content: center;
3131
}
32-
33-
.formFrame {
34-
position: relative;
35-
padding: 40px;
36-
background-image: url("/signin_form_frame.png");
37-
background-size: 100% 100%;
38-
background-repeat: no-repeat;
39-
background-position: center;
40-
}

‎apps/user_dashboard/src/components/account_info_with_sub_menu/account_info_with_sub_menu.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import cn from "classnames";
22
import { LogoutIcon } from "@oko-wallet/oko-common-ui/icons/logout";
33
import { ThreeDotsVerticalIcon } from "@oko-wallet/oko-common-ui/icons/three_dots_vertical";
44
import { AnchoredMenu } from "@oko-wallet/oko-common-ui/anchored_menu";
5-
import { Typography } from "@oko-wallet-common-ui/typography/typography";
5+
import { Typography } from "@oko-wallet/oko-common-ui/typography";
66

77
import styles from "./account_info_with_sub_menu.module.scss";
88
import { useUserInfoState } from "@oko-wallet-user-dashboard/state/user_info";

‎apps/user_dashboard/src/components/address_chip/address_chip.module.scss‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
.container {
2+
display: flex;
3+
align-items: center;
4+
justify-content: space-between;
5+
gap: 8px;
6+
padding: 8px 12px;
7+
background-color: var(--bg-secondary);
8+
border-radius: 8px;
9+
cursor: pointer;
10+
width: 100%;
11+
transition: background-color 0.2s;
12+
min-width: 0;
13+
14+
&:hover {
15+
background-color: var(--bg-tertiary);
16+
}
17+
}
18+
19+
.addressText {
20+
display: flex;
21+
align-items: center;
22+
min-width: 0;
23+
flex: 1;
24+
font-family: monospace;
25+
}
26+
27+
.former, .latter {
28+
color: var(--fg-secondary);
29+
font-weight: 500;
30+
white-space: pre;
31+
}
32+
33+
.middle {
34+
color: var(--fg-tertiary);
35+
font-weight: 400;
36+
white-space: pre;
37+
overflow: hidden;
38+
text-overflow: ellipsis;
39+
min-width: 0;
40+
}
41+
42+
.iconContainer {
43+
display: flex;
44+
align-items: center;
45+
justify-content: center;
46+
flex-shrink: 0;
47+
}
48+

0 commit comments

Comments
 (0)