Merge pull request #798 from Koniverse/issue-796

[Issue-796]: Error page in case touch Icon account in Browser tab and fix some UI bugs
Koniverse · Jun 20, 2023 · bed71bc · bed71bc
2 parents e727e1c + 141c837
commit bed71bc
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/src/components/AccountSettingButton.tsx b/src/components/AccountSettingButton.tsx
@@ -20,7 +20,7 @@ export const AccountSettingButton = ({ navigation }: Props) => {
   return (
     <TouchableOpacity
       onPress={() => {
-        navigation.navigate('AccountsScreen');
+        navigation.navigate('AccountsScreen', {});
       }}>
       <View>
         <SubWalletAvatar address={currentAccountAddress || ''} size={32} SubIcon={SubIcon} />

diff --git a/src/screens/Account/AccountsScreen/index.tsx b/src/screens/Account/AccountsScreen/index.tsx
@@ -153,6 +153,7 @@ export const AccountsScreen = ({
         searchFunction={searchFunction}
         autoFocus={false}
         afterListItem={renderFooterComponent()}
+        placeholder={i18n.placeholder.accountName}
       />
 
       <AccountCreationArea

diff --git a/src/screens/Home/Crypto/ReceiveModal.tsx b/src/screens/Home/Crypto/ReceiveModal.tsx
@@ -151,7 +151,9 @@ export const ReceiveModal = ({ address, selectedNetwork, modalVisible, onCancel
           <Button
             style={{ flex: 1 }}
             disabled={!scanExplorerAddressUrl}
-            icon={<Icon phosphorIcon={GlobeHemisphereWest} weight={'fill'} size={'lg'} />}
+            icon={(iconColor: string) => (
+              <Icon phosphorIcon={GlobeHemisphereWest} weight={'fill'} size={'lg'} iconColor={iconColor} />
+            )}
             type={'secondary'}
             onPress={() => {
               !!scanExplorerAddressUrl && Linking.openURL(scanExplorerAddressUrl);

diff --git a/src/screens/Transaction/helper/staking/stakingHandler.ts b/src/screens/Transaction/helper/staking/stakingHandler.ts
@@ -18,7 +18,7 @@ export function getUnstakingPeriod(unstakingPeriod?: number) {
 }
 
 export function getWaitingTime(waitingTime?: number) {
-  const days = waitingTime ? Number(waitingTime / 24).toFixed(2) : 0;
+  const days = waitingTime ? Number(waitingTime / 24).toFixed(0) : 0;
 
   if (days < 1) {
     if (days) {