diff --git a/Cargo.lock b/Cargo.lock
index 488f3b4a756db..c3b07170d6df8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -11449,6 +11449,7 @@ dependencies = [
  "tokio",
  "tower",
  "tower-http",
+ "uuid",
  "workspace-hack",
 ]
 
diff --git a/apps/wallet/src/background/auto-lock-accounts.ts b/apps/wallet/src/background/auto-lock-accounts.ts
index 82de82746aed6..8e44af92a653a 100644
--- a/apps/wallet/src/background/auto-lock-accounts.ts
+++ b/apps/wallet/src/background/auto-lock-accounts.ts
@@ -40,5 +40,5 @@ export const notifyUserActive = throttle(
 	() => {
 		setupAutoLockAlarm();
 	},
-	{ noLeading: true },
+	{ noTrailing: true },
 );
diff --git a/apps/wallet/src/ui/app/components/accounts/AutoLockSelector.tsx b/apps/wallet/src/ui/app/components/accounts/AutoLockSelector.tsx
index 5576d425c6bfd..136e7c44e4c85 100644
--- a/apps/wallet/src/ui/app/components/accounts/AutoLockSelector.tsx
+++ b/apps/wallet/src/ui/app/components/accounts/AutoLockSelector.tsx
@@ -63,6 +63,7 @@ export function AutoLockSelector({ disabled }: AutoLockSelectorProps) {
 						disabled={disabled || !timerEnabled}
 						type="number"
 						{...register('autoLock.timer')}
+						data-testid="auto-lock-timer"
 					/>
 					<SelectField
 						disabled={disabled || !timerEnabled}
diff --git a/apps/wallet/src/ui/app/components/accounts/LockUnlockButton.tsx b/apps/wallet/src/ui/app/components/accounts/LockUnlockButton.tsx
index aa007c6e3bd36..7817ebe243148 100644
--- a/apps/wallet/src/ui/app/components/accounts/LockUnlockButton.tsx
+++ b/apps/wallet/src/ui/app/components/accounts/LockUnlockButton.tsx
@@ -18,6 +18,7 @@ export function LockUnlockButton({ isLocked, onClick, isLoading }: LockUnlockBut
 			<button
 				className="appearance-none bg-transparent border-none cursor-pointer text-steel hover:text-hero-dark ml-auto flex items-center justify-center"
 				onClick={onClick}
+				data-testid={isLocked ? 'unlock-account-button' : 'lock-account-button'}
 			>
 				{isLoading ? (
 					<LoadingIndicator />
diff --git a/apps/wallet/src/ui/app/index.tsx b/apps/wallet/src/ui/app/index.tsx
index 653419dbc6f79..9a3e616d73cae 100644
--- a/apps/wallet/src/ui/app/index.tsx
+++ b/apps/wallet/src/ui/app/index.tsx
@@ -66,7 +66,7 @@ const HIDDEN_MENU_PATHS = [
 	'/apps/disconnectapp',
 ];
 
-const notifyUserActiveInterval = 15 * 1000; // 15 seconds
+const notifyUserActiveInterval = 5 * 1000; // 5 seconds
 
 const App = () => {
 	const dispatch = useAppDispatch();
@@ -137,9 +137,13 @@ const App = () => {
 		if (!autoLockEnabled) {
 			return;
 		}
-		const sendUpdateThrottled = throttle(notifyUserActiveInterval, () => {
-			backgroundClient.notifyUserActive();
-		});
+		const sendUpdateThrottled = throttle(
+			notifyUserActiveInterval,
+			() => {
+				backgroundClient.notifyUserActive();
+			},
+			{ noTrailing: true },
+		);
 		document.addEventListener('mousemove', sendUpdateThrottled);
 		document.addEventListener('keydown', sendUpdateThrottled);
 		return () => {
diff --git a/apps/wallet/tests/balanceChanges.spec.ts b/apps/wallet/tests/balanceChanges.spec.ts
index 9b6655425ac37..94f4e17398d84 100644
--- a/apps/wallet/tests/balanceChanges.spec.ts
+++ b/apps/wallet/tests/balanceChanges.spec.ts
@@ -5,8 +5,6 @@ import { expect, test } from './fixtures';
 import { createWallet, importWallet } from './utils/auth';
 import { generateKeypairFromMnemonic, requestSuiFromFaucet } from './utils/localnet';
 
-test.skip();
-
 const receivedAddressMnemonic = [
 	'beef',
 	'beef',
@@ -40,12 +38,14 @@ const currentWalletMnemonic = [
 const COIN_TO_SEND = 20;
 
 test('request SUI from local faucet', async ({ page, extensionUrl }) => {
+	const timeout = 30_000;
+	test.setTimeout(timeout);
 	await createWallet(page, extensionUrl);
 	await page.getByRole('navigation').getByRole('link', { name: 'Coins' }).click();
 
 	const originalBalance = await page.getByTestId('coin-balance').textContent();
 	await page.getByTestId('faucet-request-button').click();
-	await expect(page.getByText(/SUI Received/i)).toBeVisible();
+	await expect(page.getByText(/SUI Received/i)).toBeVisible({ timeout });
 	await expect(page.getByTestId('coin-balance')).not.toHaveText(`${originalBalance}SUI`);
 });
 
diff --git a/apps/wallet/tests/demo-app/src/index.tsx b/apps/wallet/tests/demo-app/src/index.tsx
index 42dfe89059ad3..f2529770a9f92 100644
--- a/apps/wallet/tests/demo-app/src/index.tsx
+++ b/apps/wallet/tests/demo-app/src/index.tsx
@@ -93,7 +93,7 @@ function App() {
 			<button
 				onClick={async () => {
 					setError(null);
-					const txb = getDemoTransaction(accounts[0]?.address);
+					const txb = getDemoTransaction(accounts[0]?.address || '');
 					try {
 						await suiWallet.features[
 							'sui:signAndExecuteTransactionBlock'
@@ -112,7 +112,7 @@ function App() {
 			<button
 				onClick={async () => {
 					setError(null);
-					const txb = getDemoTransaction(accounts[0]?.address);
+					const txb = getDemoTransaction(accounts[0]?.address || '');
 					try {
 						await suiWallet.features['sui:signTransactionBlock'].signTransactionBlock({
 							transactionBlock: txb,
diff --git a/apps/wallet/tests/lock.spec.ts b/apps/wallet/tests/lock.spec.ts
index c2effccab7afd..962577dbdabc8 100644
--- a/apps/wallet/tests/lock.spec.ts
+++ b/apps/wallet/tests/lock.spec.ts
@@ -4,39 +4,32 @@
 import { expect, test } from './fixtures';
 import { createWallet } from './utils/auth';
 
-test.skip();
-
-test('wallet unlock', async ({ page, context, extensionUrl }) => {
-	test.skip(true, 'Skip while zkLogin work is in progress');
-
+test('account lock-unlock', async ({ page, context, extensionUrl }) => {
 	await createWallet(page, extensionUrl);
-	await page.getByTestId('menu').click();
-	await page.getByRole('button', { name: /Lock Wallet/ }).click();
-	await page.getByLabel('Enter Password').fill('mystenlabs');
-	await page.getByRole('button', { name: /Unlock Wallet/ }).click();
-	await expect(page.getByTestId('coin-page')).toBeVisible();
+	await page.getByTestId('lock-account-button').click();
+	await page.getByTestId('unlock-account-button').click();
+	await page.getByPlaceholder('Password').fill('mystenlabs');
+	await page.getByRole('button', { name: /Unlock/ }).click();
+	await expect(page.getByTestId('coin-balance')).toBeVisible();
 });
 
 test('wallet auto-lock', async ({ page, extensionUrl }) => {
-	test.skip(true, 'Skip while zkLogin work is in progress');
-
 	test.skip(
 		process.env.CI !== 'true',
 		'Runs only on CI since it takes at least 1 minute to complete',
 	);
 	test.setTimeout(65 * 1000);
 	await createWallet(page, extensionUrl);
-	await page.getByTestId('menu').click();
+	await page.getByLabel(/Open settings menu/).click();
 	await page.getByText(/Auto-lock/).click();
-	await page.getByPlaceholder(/Auto lock minutes/i).fill('1');
-	await page.getByRole('button', { name: /Save/i }).click();
-	await page.getByText(/Auto lock updated/i);
-	await page.evaluate(() => {
-		Object.defineProperty(document, 'visibilityState', {
-			value: 'hidden',
-		});
-		document.dispatchEvent(new Event('visibilitychange'));
-	});
+	await page.getByLabel(/Auto-lock after I am inactive for/i).click();
+	await page.getByTestId('auto-lock-timer').fill('1');
+	await page.getByRole('combobox').click();
+	await page.getByRole('option', { name: /Minute/ }).click();
+	await page.getByText('Save').click();
+	await page.getByText(/Saved/i);
+	await page.getByTestId('close-icon').click();
+	await page.getByLabel(/Close settings menu/).click();
 	await page.waitForTimeout(60 * 1000);
-	await expect(page.getByRole('button', { name: /Unlock Wallet/ })).toBeVisible();
+	await expect(page.getByRole('button', { name: /Unlock/ })).toBeVisible();
 });
diff --git a/apps/wallet/tests/onboarding.spec.ts b/apps/wallet/tests/onboarding.spec.ts
index 45210e22a7839..251b85dae4dd6 100644
--- a/apps/wallet/tests/onboarding.spec.ts
+++ b/apps/wallet/tests/onboarding.spec.ts
@@ -2,29 +2,18 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { expect, test } from './fixtures';
-import { createWallet } from './utils/auth';
+import { createWallet, importWallet } from './utils/auth';
 import { generateKeypair } from './utils/localnet';
 
-test.skip();
-
 test('create new wallet', async ({ page, extensionUrl }) => {
 	await createWallet(page, extensionUrl);
-	await expect(page.getByTestId('apps-page')).toBeVisible();
+	await page.getByRole('navigation').getByRole('link', { name: 'Coins' }).click();
+	await expect(page.getByTestId('coin-page')).toBeVisible();
 });
 
 test('import wallet', async ({ page, extensionUrl }) => {
 	const { mnemonic, keypair } = await generateKeypair();
-
-	await page.goto(extensionUrl);
-	await page.getByRole('link', { name: /Get Started/ }).click();
-	await page.getByRole('link', { name: /Import an Existing Wallet/ }).click();
-	await page.getByLabel('Enter your 12-word Recovery Phrase').type(mnemonic);
-	await page.getByRole('button', { name: /Continue/ }).click();
-	await page.getByLabel('Create Password').fill('mystenlabs');
-	await page.getByLabel('Confirm Password').fill('mystenlabs');
-	await page.getByRole('button', { name: /Import/ }).click();
-	await page.getByRole('link', { name: /Open Sui Wallet/ }).click();
-	await page.getByTestId('bullshark-dismiss').click();
+	importWallet(page, extensionUrl, mnemonic);
 	await page.getByRole('navigation').getByRole('link', { name: 'Coins' }).click();
 	await expect(
 		page.getByText(keypair.getPublicKey().toSuiAddress().slice(0, 6)).first(),
diff --git a/apps/wallet/tests/sites-to-cs-messaging.spec.ts b/apps/wallet/tests/sites-to-cs-messaging.spec.ts
index 08a25f0713c12..f14bf988e9839 100644
--- a/apps/wallet/tests/sites-to-cs-messaging.spec.ts
+++ b/apps/wallet/tests/sites-to-cs-messaging.spec.ts
@@ -7,8 +7,6 @@ import { expect, test } from './fixtures';
 import { createWallet } from './utils/auth';
 import { demoDappConnect } from './utils/dapp-connect';
 
-test.skip();
-
 function getInAppMessage(page: Page, id: string) {
 	return page.evaluate(
 		(anId) =>
diff --git a/apps/wallet/tests/staking.spec.ts b/apps/wallet/tests/staking.spec.ts
index 05c2b554ce8d1..a2fd4e43a7e2a 100644
--- a/apps/wallet/tests/staking.spec.ts
+++ b/apps/wallet/tests/staking.spec.ts
@@ -7,8 +7,8 @@ import { createWallet } from './utils/auth';
 const TEST_TIMEOUT = 45 * 1000;
 const STAKE_AMOUNT = 100;
 
-test.skip('staking', async ({ page, extensionUrl }) => {
-	test.setTimeout(TEST_TIMEOUT);
+test('staking', async ({ page, extensionUrl }) => {
+	test.setTimeout(4 * TEST_TIMEOUT);
 
 	await createWallet(page, extensionUrl);
 
@@ -27,13 +27,12 @@ test.skip('staking', async ({ page, extensionUrl }) => {
 	await expect(page.getByTestId('transaction-status')).toHaveText('Transaction Success');
 
 	await page.getByTestId('close-icon').click();
-	await expect(page.getByText(`Currently Staked${STAKE_AMOUNT} SUI`)).toBeVisible();
-
-	await page.getByText(`Currently Staked${STAKE_AMOUNT} SUI`).click();
-	await expect(page.getByText(/Starts Earning now/)).toBeVisible({
+	await expect(page.getByText(`Currently Staked${STAKE_AMOUNT} SUI`)).toBeVisible({
 		timeout: TEST_TIMEOUT,
 	});
 
+	await page.getByText(`Currently Staked${STAKE_AMOUNT} SUI`).click();
+	await expect(page.getByTestId('stake-card')).toBeVisible({ timeout: 3 * TEST_TIMEOUT });
 	await page.getByTestId('stake-card').click();
 	await page.getByTestId('unstake-button').click();
 	await page.getByRole('button', { name: 'Unstake Now' }).click();
diff --git a/apps/wallet/tests/tabs.spec.ts b/apps/wallet/tests/tabs.spec.ts
index ca96d06fe0d39..3e39e57038c3b 100644
--- a/apps/wallet/tests/tabs.spec.ts
+++ b/apps/wallet/tests/tabs.spec.ts
@@ -4,8 +4,6 @@
 import { expect, test } from './fixtures';
 import { createWallet } from './utils/auth';
 
-test.skip();
-
 test('Assets tab', async ({ page, extensionUrl }) => {
 	await createWallet(page, extensionUrl);
 	await page.getByRole('navigation').getByRole('link', { name: 'Assets' }).click();
diff --git a/apps/wallet/tests/utils/auth.ts b/apps/wallet/tests/utils/auth.ts
index 458f828040fb8..aeaa12189ebbb 100644
--- a/apps/wallet/tests/utils/auth.ts
+++ b/apps/wallet/tests/utils/auth.ts
@@ -7,30 +7,27 @@ export const PASSWORD = 'mystenlabs';
 
 export async function createWallet(page: Page, extensionUrl: string) {
 	await page.goto(extensionUrl);
-	await page.getByRole('link', { name: /Get Started/ }).click();
-	await page.getByRole('link', { name: /Create a New Wallet/ }).click();
-	await page.getByLabel('Create Password').fill('mystenlabs');
-	await page.getByLabel('Confirm Password').fill('mystenlabs');
-	await page.locator('label', { has: page.locator('input[type=checkbox]') }).click();
+	await page.getByRole('link', { name: /More Options/ }).click();
+	await page.getByRole('link', { name: /Create a new Passphrase Account/ }).click();
+	await page.getByLabel('Create Account Password').fill('mystenlabs');
+	await page.getByLabel('Confirm Account Password').fill('mystenlabs');
+	await page.getByLabel('I read and agreed to the').click();
 	await page.getByRole('button', { name: /Create Wallet/ }).click();
 	await page.locator('label', { has: page.locator('input[type=checkbox]') }).click();
 	await page.getByRole('link', { name: /Open Sui Wallet/ }).click();
-	await page.getByTestId('bullshark-dismiss').click();
 }
 
-export async function importWallet(page: Page, extensionUrl: string, mnemonic: string[]) {
+export async function importWallet(page: Page, extensionUrl: string, mnemonic: string | string[]) {
 	await page.goto(extensionUrl);
-	await page.getByRole('link', { name: /Get Started/ }).click();
-	await page.getByRole('link', { name: /Import an Existing Wallet/ }).click();
-	const inputs = await page.locator('input[type=password]');
-	const inputsCount = await inputs.count();
-	for (let i = 0; i < inputsCount; i++) {
-		await inputs.nth(i).fill(mnemonic[i]);
-	}
-	await page.getByRole('button', { name: /Continue/ }).click();
-	await page.getByLabel('Create Password').fill(PASSWORD);
-	await page.getByLabel('Confirm Password').fill(PASSWORD);
-	await page.getByRole('button', { name: /Import/ }).click();
-	await page.getByRole('link', { name: /Open Sui Wallet/ }).click();
-	await page.getByTestId('bullshark-dismiss').click();
+	await page.getByRole('link', { name: /More Options/ }).click();
+	await page.getByRole('link', { name: /Import Passphrase/ }).click();
+	await page
+		.getByPlaceholder('Password')
+		.first()
+		.type(typeof mnemonic === 'string' ? mnemonic : mnemonic.join(' '));
+	await page.getByRole('button', { name: /Add Account/ }).click();
+	await page.getByLabel('Create Account Password').fill(PASSWORD);
+	await page.getByLabel('Confirm Account Password').fill(PASSWORD);
+	await page.getByLabel('I read and agreed to the').click();
+	await page.getByRole('button', { name: /Create Wallet/ }).click();
 }
diff --git a/crates/sui-cluster-test/src/faucet.rs b/crates/sui-cluster-test/src/faucet.rs
index dcc78666ccad3..7fabde6f92677 100644
--- a/crates/sui-cluster-test/src/faucet.rs
+++ b/crates/sui-cluster-test/src/faucet.rs
@@ -6,7 +6,10 @@ use fastcrypto::encoding::{Encoding, Hex};
 use std::collections::HashMap;
 use std::env;
 use std::sync::Arc;
-use sui_faucet::{Faucet, FaucetConfig, FaucetResponse, SimpleFaucet};
+use sui_faucet::{
+    BatchFaucetResponse, BatchStatusFaucetResponse, Faucet, FaucetConfig, FaucetResponse,
+    SimpleFaucet,
+};
 use sui_types::base_types::SuiAddress;
 use sui_types::crypto::KeypairTraits;
 use tracing::{debug, info, info_span, Instrument};
@@ -51,6 +54,8 @@ impl FaucetClientFactory {
 #[async_trait]
 pub trait FaucetClient {
     async fn request_sui_coins(&self, request_address: SuiAddress) -> FaucetResponse;
+    async fn batch_request_sui_coins(&self, request_address: SuiAddress) -> BatchFaucetResponse;
+    async fn get_batch_send_status(&self, task_id: Uuid) -> BatchStatusFaucetResponse;
 }
 
 /// Client for a remote faucet that is accessible by POST requests
@@ -96,6 +101,63 @@ impl FaucetClient for RemoteFaucetClient {
             panic!("Failed to get gas tokens with error: {}", error)
         };
 
+        faucet_response
+    }
+    async fn batch_request_sui_coins(&self, request_address: SuiAddress) -> BatchFaucetResponse {
+        let gas_url = format!("{}/v1/gas", self.remote_url);
+        debug!("Getting coin from remote faucet {}", gas_url);
+        let data = HashMap::from([("recipient", Hex::encode(request_address))]);
+        let map = HashMap::from([("FixedAmountRequest", data)]);
+
+        let auth_header = match env::var("FAUCET_AUTH_HEADER") {
+            Ok(val) => val,
+            _ => "".to_string(),
+        };
+
+        let response = reqwest::Client::new()
+            .post(&gas_url)
+            .header("Authorization", auth_header)
+            .json(&map)
+            .send()
+            .await
+            .unwrap_or_else(|e| panic!("Failed to talk to remote faucet {:?}: {:?}", gas_url, e));
+        let full_bytes = response.bytes().await.unwrap();
+        let faucet_response: BatchFaucetResponse = serde_json::from_slice(&full_bytes)
+            .map_err(|e| anyhow::anyhow!("json deser failed with bytes {:?}: {e}", full_bytes))
+            .unwrap();
+
+        if let Some(error) = faucet_response.error {
+            panic!("Failed to get gas tokens with error: {}", error)
+        };
+
+        faucet_response
+    }
+    async fn get_batch_send_status(&self, task_id: Uuid) -> BatchStatusFaucetResponse {
+        let status_url = format!("{}/v1/status/{}", self.remote_url, task_id);
+        debug!(
+            "Checking status for task {} from remote faucet {}",
+            task_id.to_string(),
+            status_url
+        );
+
+        let auth_header = match env::var("FAUCET_AUTH_HEADER") {
+            Ok(val) => val,
+            _ => "".to_string(),
+        };
+
+        let response = reqwest::Client::new()
+            .get(&status_url)
+            .header("Authorization", auth_header)
+            .send()
+            .await
+            .unwrap_or_else(|e| {
+                panic!("Failed to talk to remote faucet {:?}: {:?}", status_url, e)
+            });
+        let full_bytes = response.bytes().await.unwrap();
+        let faucet_response: BatchStatusFaucetResponse = serde_json::from_slice(&full_bytes)
+            .map_err(|e| anyhow::anyhow!("json deser failed with bytes {:?}: {e}", full_bytes))
+            .unwrap();
+
         faucet_response
     }
 }
@@ -122,4 +184,22 @@ impl FaucetClient for LocalFaucetClient {
 
         receipt.into()
     }
+    async fn batch_request_sui_coins(&self, request_address: SuiAddress) -> BatchFaucetResponse {
+        let receipt = self
+            .simple_faucet
+            .batch_send(Uuid::new_v4(), request_address, &[200_000_000_000; 5])
+            .await
+            .unwrap_or_else(|err| panic!("Failed to get gas tokens with error: {}", err));
+
+        receipt.into()
+    }
+    async fn get_batch_send_status(&self, task_id: Uuid) -> BatchStatusFaucetResponse {
+        let status = self
+            .simple_faucet
+            .get_batch_send_status(task_id)
+            .await
+            .unwrap_or_else(|err| panic!("Failed to get gas tokens with error: {}", err));
+
+        status.into()
+    }
 }
diff --git a/crates/sui-test-validator/Cargo.toml b/crates/sui-test-validator/Cargo.toml
index 16418a040c253..67186db7667d9 100644
--- a/crates/sui-test-validator/Cargo.toml
+++ b/crates/sui-test-validator/Cargo.toml
@@ -14,6 +14,7 @@ axum.workspace = true
 tower.workspace = true
 tower-http.workspace = true
 http.workspace = true
+uuid.workspace = true
 
 sui-faucet.workspace = true
 sui-cluster-test.workspace = true
diff --git a/crates/sui-test-validator/src/main.rs b/crates/sui-test-validator/src/main.rs
index a4f4e1d3d0ff9..cc0d015e91064 100644
--- a/crates/sui-test-validator/src/main.rs
+++ b/crates/sui-test-validator/src/main.rs
@@ -3,6 +3,7 @@
 
 use anyhow::Result;
 use axum::{
+    extract::Path,
     response::IntoResponse,
     routing::{get, post},
     Extension, Json, Router,
@@ -15,9 +16,13 @@ use sui_cluster_test::{
     config::{ClusterTestOpt, Env},
     faucet::{FaucetClient, FaucetClientFactory},
 };
-use sui_faucet::{FaucetRequest, FixedAmountRequest};
+use sui_faucet::{
+    BatchFaucetResponse, BatchStatusFaucetResponse, FaucetError, FaucetRequest, FaucetResponse,
+    FixedAmountRequest,
+};
 use tower::ServiceBuilder;
 use tower_http::cors::{Any, CorsLayer};
+use uuid::Uuid;
 
 /// Start a Sui validator and fullnode for easy testing.
 #[derive(Parser, Debug)]
@@ -134,6 +139,8 @@ async fn start_faucet(cluster: &LocalNewCluster, port: u16) -> Result<()> {
     let app = Router::new()
         .route("/", get(health))
         .route("/gas", post(faucet_request))
+        .route("/v1/gas", post(faucet_batch_request))
+        .route("/v1/status/:task_id", get(request_status))
         .layer(
             ServiceBuilder::new()
                 .layer(cors)
@@ -165,8 +172,14 @@ async fn faucet_request(
         FaucetRequest::FixedAmountRequest(FixedAmountRequest { recipient }) => {
             state.faucet.request_sui_coins(recipient).await
         }
-        // (jian) TODO: add this onto the validator and cluster test faucets
-        FaucetRequest::GetBatchSendStatusRequest(_) => todo!(),
+        _ => {
+            return (
+                StatusCode::BAD_REQUEST,
+                Json(FaucetResponse::from(FaucetError::Internal(
+                    "Input Error.".to_string(),
+                ))),
+            )
+        }
     };
 
     if !result.transferred_gas_objects.is_empty() {
@@ -175,3 +188,45 @@ async fn faucet_request(
         (StatusCode::INTERNAL_SERVER_ERROR, Json(result))
     }
 }
+
+async fn faucet_batch_request(
+    Extension(state): Extension<Arc<AppState>>,
+    Json(payload): Json<FaucetRequest>,
+) -> impl IntoResponse {
+    let result = match payload {
+        FaucetRequest::FixedAmountRequest(FixedAmountRequest { recipient }) => {
+            state.faucet.batch_request_sui_coins(recipient).await
+        }
+        _ => {
+            return (
+                StatusCode::BAD_REQUEST,
+                Json(BatchFaucetResponse::from(FaucetError::Internal(
+                    "Input Error.".to_string(),
+                ))),
+            )
+        }
+    };
+    if result.task.is_some() {
+        (StatusCode::CREATED, Json(result))
+    } else {
+        (StatusCode::INTERNAL_SERVER_ERROR, Json(result))
+    }
+}
+
+async fn request_status(
+    Extension(state): Extension<Arc<AppState>>,
+    Path(id): Path<String>,
+) -> impl IntoResponse {
+    match Uuid::parse_str(&id) {
+        Ok(task_id) => {
+            let status = state.faucet.get_batch_send_status(task_id).await;
+            (StatusCode::CREATED, Json(status))
+        }
+        Err(e) => (
+            StatusCode::INTERNAL_SERVER_ERROR,
+            Json(BatchStatusFaucetResponse::from(FaucetError::Internal(
+                e.to_string(),
+            ))),
+        ),
+    }
+}