Merge pull request #414 from Peersyst/refactor/imporove-wallet-stability

Refactor/imporove wallet stability
Peersyst · Feb 13, 2024 · 271a323 · 271a323
2 parents b8cdcd8 + 3dbddad
commit 271a323
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 9 deletions.
diff --git a/src/module/sdk/NearSdkService/NearSdkService.ts b/src/module/sdk/NearSdkService/NearSdkService.ts
@@ -476,7 +476,14 @@ export class NearSDKService {
 
     async getRecentActivity(): Promise<Action[]> {
         this.getConnection();
-        return await this.apiService.getRecentActivity({ address: this.getAddress() });
+        let actions: Action[] = [];
+        try {
+            actions = await this.apiService.getRecentActivity({ address: this.getAddress() });
+        } catch (e: any) {
+            //eslint-disable-next-line no-console
+            console.warn("Error getting recent activity: ", e);
+        }
+        return actions;
     }
 
     // --------------------------------------------------------------
@@ -593,16 +600,32 @@ export class NearSDKService {
     }
 
     async getAllValidators(): Promise<Validator[]> {
-        const validators = await this.getAllValidatorIds();
-        const validatorsProms = validators.map((validator) => this.getValidatorDataFromId(validator, false, undefined, true));
-        const validatorsPromise = await Promise.all(validatorsProms);
-        return validatorsPromise.filter((validator: Validator) => (validator.fee ? validator.fee : 0 > 0));
+        let availableValidatorsList: Validator[] = [];
+        try {
+            const validators = await this.getAllValidatorIds();
+            const validatorsProms = validators.map((validator) => this.getValidatorDataFromId(validator, false, undefined, true));
+            const validatorsPromise = await Promise.all(validatorsProms);
+            availableValidatorsList = validatorsPromise.filter((validator: Validator) => (validator.fee ? validator.fee : 0 > 0));
+        } catch (e) {
+            //eslint-disable-next-line no-console
+            console.warn("Error in getAllValidators: ", e);
+        }
+        return availableValidatorsList;
     }
 
     async getCurrentValidators(): Promise<Validator[]> {
-        const stakingDeposits = await this.apiService.getStakingDeposits({ address: this.getAddress() });
-        const validatorsProms = stakingDeposits.map(({ validatorId, amount }) => this.getValidatorDataFromId(validatorId, true, amount));
-        return await Promise.all(validatorsProms);
+        let validators: Validator[] = [];
+        try {
+            const stakingDeposits = await this.apiService.getStakingDeposits({ address: this.getAddress() });
+            const validatorsProms = stakingDeposits.map(({ validatorId, amount }) =>
+                this.getValidatorDataFromId(validatorId, true, amount),
+            );
+            validators = await Promise.all(validatorsProms);
+        } catch (e) {
+            //eslint-disable-next-line no-console
+            console.warn("Error in getCurrentValidators: ", e);
+        }
+        return validators;
     }
 
     private addStakingBalancesFromValidators(validators: Validator[]): StakingBalance {

diff --git a/src/module/token/component/display/TokenCard/TokenCard.tsx b/src/module/token/component/display/TokenCard/TokenCard.tsx
@@ -17,7 +17,7 @@ const TokenCard = ({ token }: TokenCardProps): JSX.Element => {
         <MainListCard alignItems="center" justifyContent="space-between">
             <Row alignItems="center" gap={16}>
                 <TokenIcon token={token} />
-                <Typography variant="body3Strong" numberOfLines={1} style={{ maxWidth: "70%" }}>
+                <Typography variant="body3Strong" numberOfLines={1} style={{ flex: 0.6 }}>
                     {name}
                 </Typography>
             </Row>