submitting tx spinner

RunOnFlux · Dec 23, 2023 · 8cd2dca · 8cd2dca
1 parent 64d5406
commit 8cd2dca
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 6 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -82,7 +82,7 @@ android {
         applicationId "io.runonflux.sspkey"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 6
+        versionCode 7
         versionName "1.0.1"
     }
     signingConfigs {

diff --git a/src/screens/Home/Home.tsx b/src/screens/Home/Home.tsx
@@ -99,6 +99,7 @@ function Home({ navigation }: Props) {
     (state) => state[activeChain],
   );
   const [activityStatus, setActivityStatus] = useState(false);
+  const [submittingTransaction, setSubmittingTransaction] = useState(false);
 
   const { newTx, clearTx } = useSocket();
 
@@ -436,7 +437,7 @@ function Home({ navigation }: Props) {
   ) => {
     try {
       console.log('tx request');
-      // todo enable spinner here
+      setSubmittingTransaction(true);
       const id = await getUniqueId();
       const password = await EncryptedStorage.getItem('ssp_key_pw');
       const pwForEncryption = id + password;
@@ -495,7 +496,7 @@ function Home({ navigation }: Props) {
       displayMessage('error', t('home:err_tx_failed'));
       console.log(error);
     } finally {
-      console.log('all done. todo Disable spinner');
+      setSubmittingTransaction(false);
     }
   };
   const handleManualInput = async (manualInput: string) => {
@@ -782,7 +783,29 @@ function Home({ navigation }: Props) {
             Layout.colCenter,
           ]}
         >
-          {!rawTx && !syncReq && (
+          {submittingTransaction && (
+            <View
+              style={[
+                Layout.fill,
+                Layout.relative,
+                Layout.fullWidth,
+                Layout.justifyContentCenter,
+                Layout.alignItemsCenter,
+              ]}
+            >
+              <Icon name="send" size={60} color={Colors.textGray400} />
+              <Text
+                style={[Fonts.textBold, Fonts.textRegular, Gutters.smallMargin]}
+              >
+                {t('home:submitting_transaction')}
+              </Text>
+              <ActivityIndicator
+                size={'large'}
+                style={[Layout.row, Gutters.regularVMargin, { height: 30 }]}
+              />
+            </View>
+          )}
+          {!submittingTransaction && !rawTx && !syncReq && (
             <>
               <View
                 style={[
@@ -873,7 +896,7 @@ function Home({ navigation }: Props) {
               </View>
             </>
           )}
-          {rawTx && xpubWallet && xpubKey && (
+          {!submittingTransaction && rawTx && xpubWallet && xpubKey && (
             <TransactionRequest
               rawTx={rawTx}
               chain={activeChain as keyof cryptos}

diff --git a/src/translations/resources/en/home.json b/src/translations/resources/en/home.json
@@ -64,5 +64,6 @@
   "select_chain": "Select Chain",
   "selected_chain": "Selected Chain",
   "selected_chain_wallet":"Selected Chain and Wallet",
-  "chain_not_synced_scan": "Chain Not Synced with SSP Wallet. Scan SSP Wallet QR Code to Sync it."
+  "chain_not_synced_scan": "Chain Not Synced with SSP Wallet. Scan SSP Wallet QR Code to Sync it.",
+  "submitting_transaction": "Submitting Transaction..."
 }